summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21506 from ↵Thomas Müller2016-01-0714-21/+38
|\ | | | | | | | | owncloud/issue-20218-min-max-owncloud-version-warning Issue 20218 min max owncloud version warning
| * Remove deprecated shipped flag from info.xml which has no use anymoreJoas Schilling2016-01-079-9/+0
| |
| * Add ownCloud min and max version for shipped appsJoas Schilling2016-01-0710-12/+14
| |
| * Add a warning to the app:check-code if the version is missingJoas Schilling2016-01-072-0/+9
| |
| * Add a warning on the apps list when the version is missingJoas Schilling2016-01-072-0/+15
| |
* | Merge pull request #21512 from owncloud/allow-searching-by-app-idThomas Müller2016-01-071-0/+5
|\ \ | | | | | | Allow searching apps by ID
| * | Allow searching apps by IDJoas Schilling2016-01-071-0/+5
|/ /
* | Merge pull request #21481 from owncloud/ext-smb-dependenciesThomas Müller2016-01-071-2/+4
|\ \ | | | | | | Check libsmbclient-php as well as smbclient binary
| * | Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-071-2/+4
| | |
* | | Merge pull request #21502 from owncloud/di_mimetypedetectorThomas Müller2016-01-072-0/+6
|\ \ \ | | | | | | | | Add 'OCP\Files\IMimeTypeDetector' to DI container
| * | | Add 'OCP\Files\IMimeTypeDetector' to DI containerRoeland Jago Douma2016-01-072-0/+6
| | |/ | |/| | | | | | | * Added test to server container as well
* | | Merge pull request #21507 from owncloud/users-dropdownscrollThomas Müller2016-01-071-0/+5
|\ \ \ | | | | | | | | Fix users list dropdown position after scroll
| * | | Fix users list dropdown position after scrollVincent Petry2016-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling, the position calculation of the multiselect dropdown was wrong. Adding "position: relative" to the list container makes the button calculation relative to it instead of the whole page. In this case the dropdown is properly aligned with the field regardless of scrolling.
* | | | Merge pull request #21455 from owncloud/fix-method-signatureThomas Müller2016-01-071-1/+1
|\ \ \ \ | | | | | | | | | | Fix method call + undefined variable
| * | | | Fix method call + undefined variableLukas Reschke2016-01-071-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Variable is not defined 2. Method does not expect any parameters ``` Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45 ```
* | | | Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developersThomas Müller2016-01-073-14/+40
|\ \ \ \ | |_|/ / |/| | | Allow downgrades for our brave developers, that switch between branches
| * | | Allow downgrades for our brave developers, that switch between branchesJoas Schilling2016-01-073-14/+40
| |/ /
* | | Merge pull request #20773 from owncloud/share2.0_createThomas Müller2016-01-0714-74/+2542
|\ \ \ | | | | | | | | [Sharing 2.0] create share
| * | | [Sharing 2.0] Some error cases report 404 instead of 403Roeland Jago Douma2016-01-062-8/+16
| | | |
| * | | [Sharing 2.0] Add L10N instance to manager for translated errorsRoeland Jago Douma2016-01-064-28/+65
| | | |
| * | | [Sharing 2.0] Do not use static function to get numeric storage idRoeland Jago Douma2016-01-062-5/+15
| | | |
| * | | [Sharing 2.0] General exceptions return 403Roeland Jago Douma2016-01-061-1/+1
| | | | | | | | | | | | | | | | This is the same as the old behaviour
| * | | Skip one intergration test until we have fixed the getsharesRoeland Jago Douma2016-01-061-17/+20
| | | | | | | | | | | | | | | | | | | | The new sharing code handles things differently so there is no way for create shares to handle this all properly.
| * | | Make sure to login at least once for the intergration testsRoeland Jago Douma2016-01-061-1/+7
| | | | | | | | | | | | | | | | Else we run into race conditions with the skeleton code
| * | | [Share 2.0] Enable share creation via OCS APIRoeland Jago Douma2016-01-063-5/+432
| | | |
| * | | [Share 2.0] Make the share manager ready for share creationRoeland Jago Douma2016-01-062-21/+1676
| | | |
| * | | [Share 2.0] Make share provider ready for create sharesRoeland Jago Douma2016-01-063-13/+302
| | | |
| * | | [Share 2.0] Update share classRoeland Jago Douma2016-01-062-2/+35
| | | | | | | | | | | | | | | | More getters and setters are required to properly create shares
| * | | [Share 2.0] Update db structure to stay backwards compatibleRoeland Jago Douma2016-01-062-7/+7
| | | |
* | | | Merge pull request #21495 from owncloud/polyfillThomas Müller2016-01-071-0/+0
|\ \ \ \ | | | | | | | | | | [3rdparty] Bump symfony/polyfill-php
| * | | | [3rdparty] Bump symfony/polyfill-phpRoeland Jago Douma2016-01-071-0/+0
| | |/ / | |/| |
* | | | Merge pull request #21493 from owncloud/fix-repair-pathThomas Müller2016-01-0719-4/+1
|\ \ \ \ | | | | | | | | | | Move lib/repair to lib/private/repair
| * | | | Move lib/repair to lib/private/repairMorris Jobke2016-01-0719-4/+1
| | |_|/ | |/| |
* | | | Merge pull request #21359 from owncloud/check-changesThomas Müller2016-01-073-7/+2
|\ \ \ \ | | | | | | | | | | remove mention of 'filesystem_check_changes' => 2 from the config sample
| * | | | fix js unit testsMorris Jobke2016-01-071-2/+2
| | | | |
| * | | | Also remove it from the web interfaceRobin Appelman2016-01-071-2/+0
| | | | |
| * | | | remove mention of 'filesystem_check_changes' => 2 from the config sampleRobin Appelman2016-01-071-3/+0
| |/ / /
* | | | Merge pull request #21503 from owncloud/public-fixdownloadlinktokenLukas Reschke2016-01-072-4/+8
|\ \ \ \ | |_|/ / |/| | | Add token in webdav download link of public page
| * | | Add token in webdav download link of public pageVincent Petry2016-01-072-4/+8
|/ / /
* | | Merge pull request #21404 from owncloud/symfony_console_2.8.0Thomas Müller2016-01-071-0/+0
|\ \ \ | |/ / |/| | [3rdparty] Bump symfony/console to 2.8.0
| * | [3rdparty] Bump symfony/console to 2.8.0Roeland Jago Douma2016-01-011-0/+0
| | |
* | | Merge pull request #21343 from owncloud/ldap-showremnants-json-outputThomas Müller2016-01-071-11/+15
|\ \ \ | | | | | | | | Add an option to occ ldap:showremnants to output a json encoded array…
| * | | Add an option to occ ldap:showremnants to output a json encoded array for ↵Stephen Colebrook2015-12-221-11/+15
| | | | | | | | | | | | | | | | use in scripts and other tools.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-07184-2034/+1786
| | | |
* | | | Merge pull request #20994 from owncloud/personal-pageThomas Müller2016-01-065-102/+149
|\ \ \ \ | | | | | | | | | | improve layout of personal settings page
| * | | | fix overlap and functionality of cropperJan-Christoph Borchardt2015-12-283-3/+19
| | | | |
| * | | | improve layout of personal settings pageJan-Christoph Borchardt2015-12-285-103/+134
| | | | |
* | | | | Merge pull request #21349 from owncloud/web_use_shareeThomas Müller2016-01-062-19/+406
|\ \ \ \ \ | | | | | | | | | | | | Webinterface use sharee API
| * | | | | Added js tests for the Sharee API usageRoeland Jago Douma2015-12-301-0/+292
| | | | | |
| * | | | | Fix unit testsRoeland Jago Douma2015-12-302-7/+33
| | | | | |