Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21506 from ↵ | Thomas Müller | 2016-01-07 | 14 | -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 anymore | Joas Schilling | 2016-01-07 | 9 | -9/+0 |
| | | |||||
| * | Add ownCloud min and max version for shipped apps | Joas Schilling | 2016-01-07 | 10 | -12/+14 |
| | | |||||
| * | Add a warning to the app:check-code if the version is missing | Joas Schilling | 2016-01-07 | 2 | -0/+9 |
| | | |||||
| * | Add a warning on the apps list when the version is missing | Joas Schilling | 2016-01-07 | 2 | -0/+15 |
| | | |||||
* | | Merge pull request #21512 from owncloud/allow-searching-by-app-id | Thomas Müller | 2016-01-07 | 1 | -0/+5 |
|\ \ | | | | | | | Allow searching apps by ID | ||||
| * | | Allow searching apps by ID | Joas Schilling | 2016-01-07 | 1 | -0/+5 |
|/ / | |||||
* | | Merge pull request #21481 from owncloud/ext-smb-dependencies | Thomas Müller | 2016-01-07 | 1 | -2/+4 |
|\ \ | | | | | | | Check libsmbclient-php as well as smbclient binary | ||||
| * | | Check libsmbclient-php as well as smbclient binary | Robin McCorkell | 2016-01-07 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #21502 from owncloud/di_mimetypedetector | Thomas Müller | 2016-01-07 | 2 | -0/+6 |
|\ \ \ | | | | | | | | | Add 'OCP\Files\IMimeTypeDetector' to DI container | ||||
| * | | | Add 'OCP\Files\IMimeTypeDetector' to DI container | Roeland Jago Douma | 2016-01-07 | 2 | -0/+6 |
| | |/ | |/| | | | | | | | * Added test to server container as well | ||||
* | | | Merge pull request #21507 from owncloud/users-dropdownscroll | Thomas Müller | 2016-01-07 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Fix users list dropdown position after scroll | ||||
| * | | | Fix users list dropdown position after scroll | Vincent Petry | 2016-01-07 | 1 | -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-signature | Thomas Müller | 2016-01-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix method call + undefined variable | ||||
| * | | | | Fix method call + undefined variable | Lukas Reschke | 2016-01-07 | 1 | -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-developers | Thomas Müller | 2016-01-07 | 3 | -14/+40 |
|\ \ \ \ | |_|/ / |/| | | | Allow downgrades for our brave developers, that switch between branches | ||||
| * | | | Allow downgrades for our brave developers, that switch between branches | Joas Schilling | 2016-01-07 | 3 | -14/+40 |
| |/ / | |||||
* | | | Merge pull request #20773 from owncloud/share2.0_create | Thomas Müller | 2016-01-07 | 14 | -74/+2542 |
|\ \ \ | | | | | | | | | [Sharing 2.0] create share | ||||
| * | | | [Sharing 2.0] Some error cases report 404 instead of 403 | Roeland Jago Douma | 2016-01-06 | 2 | -8/+16 |
| | | | | |||||
| * | | | [Sharing 2.0] Add L10N instance to manager for translated errors | Roeland Jago Douma | 2016-01-06 | 4 | -28/+65 |
| | | | | |||||
| * | | | [Sharing 2.0] Do not use static function to get numeric storage id | Roeland Jago Douma | 2016-01-06 | 2 | -5/+15 |
| | | | | |||||
| * | | | [Sharing 2.0] General exceptions return 403 | Roeland Jago Douma | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This is the same as the old behaviour | ||||
| * | | | Skip one intergration test until we have fixed the getshares | Roeland Jago Douma | 2016-01-06 | 1 | -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 tests | Roeland Jago Douma | 2016-01-06 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | Else we run into race conditions with the skeleton code | ||||
| * | | | [Share 2.0] Enable share creation via OCS API | Roeland Jago Douma | 2016-01-06 | 3 | -5/+432 |
| | | | | |||||
| * | | | [Share 2.0] Make the share manager ready for share creation | Roeland Jago Douma | 2016-01-06 | 2 | -21/+1676 |
| | | | | |||||
| * | | | [Share 2.0] Make share provider ready for create shares | Roeland Jago Douma | 2016-01-06 | 3 | -13/+302 |
| | | | | |||||
| * | | | [Share 2.0] Update share class | Roeland Jago Douma | 2016-01-06 | 2 | -2/+35 |
| | | | | | | | | | | | | | | | | More getters and setters are required to properly create shares | ||||
| * | | | [Share 2.0] Update db structure to stay backwards compatible | Roeland Jago Douma | 2016-01-06 | 2 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #21495 from owncloud/polyfill | Thomas Müller | 2016-01-07 | 1 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | [3rdparty] Bump symfony/polyfill-php | ||||
| * | | | | [3rdparty] Bump symfony/polyfill-php | Roeland Jago Douma | 2016-01-07 | 1 | -0/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21493 from owncloud/fix-repair-path | Thomas Müller | 2016-01-07 | 19 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | Move lib/repair to lib/private/repair | ||||
| * | | | | Move lib/repair to lib/private/repair | Morris Jobke | 2016-01-07 | 19 | -4/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #21359 from owncloud/check-changes | Thomas Müller | 2016-01-07 | 3 | -7/+2 |
|\ \ \ \ | | | | | | | | | | | remove mention of 'filesystem_check_changes' => 2 from the config sample | ||||
| * | | | | fix js unit tests | Morris Jobke | 2016-01-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Also remove it from the web interface | Robin Appelman | 2016-01-07 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | remove mention of 'filesystem_check_changes' => 2 from the config sample | Robin Appelman | 2016-01-07 | 1 | -3/+0 |
| |/ / / | |||||
* | | | | Merge pull request #21503 from owncloud/public-fixdownloadlinktoken | Lukas Reschke | 2016-01-07 | 2 | -4/+8 |
|\ \ \ \ | |_|/ / |/| | | | Add token in webdav download link of public page | ||||
| * | | | Add token in webdav download link of public page | Vincent Petry | 2016-01-07 | 2 | -4/+8 |
|/ / / | |||||
* | | | Merge pull request #21404 from owncloud/symfony_console_2.8.0 | Thomas Müller | 2016-01-07 | 1 | -0/+0 |
|\ \ \ | |/ / |/| | | [3rdparty] Bump symfony/console to 2.8.0 | ||||
| * | | [3rdparty] Bump symfony/console to 2.8.0 | Roeland Jago Douma | 2016-01-01 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #21343 from owncloud/ldap-showremnants-json-output | Thomas Müller | 2016-01-07 | 1 | -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 Colebrook | 2015-12-22 | 1 | -11/+15 |
| | | | | | | | | | | | | | | | | use in scripts and other tools. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-07 | 184 | -2034/+1786 |
| | | | | |||||
* | | | | Merge pull request #20994 from owncloud/personal-page | Thomas Müller | 2016-01-06 | 5 | -102/+149 |
|\ \ \ \ | | | | | | | | | | | improve layout of personal settings page | ||||
| * | | | | fix overlap and functionality of cropper | Jan-Christoph Borchardt | 2015-12-28 | 3 | -3/+19 |
| | | | | | |||||
| * | | | | improve layout of personal settings page | Jan-Christoph Borchardt | 2015-12-28 | 5 | -103/+134 |
| | | | | | |||||
* | | | | | Merge pull request #21349 from owncloud/web_use_sharee | Thomas Müller | 2016-01-06 | 2 | -19/+406 |
|\ \ \ \ \ | | | | | | | | | | | | | Webinterface use sharee API | ||||
| * | | | | | Added js tests for the Sharee API usage | Roeland Jago Douma | 2015-12-30 | 1 | -0/+292 |
| | | | | | | |||||
| * | | | | | Fix unit tests | Roeland Jago Douma | 2015-12-30 | 2 | -7/+33 |
| | | | | | |