Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-14 | 22 | -76/+892 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-13 | 10 | -12/+272 |
| | |||||
* | Merge pull request #16886 from owncloud/webdav-verify-path-again | Vincent Petry | 2015-06-12 | 2 | -6/+60 |
|\ | | | | | verify path when getting a node for sabredav | ||||
| * | tests for getNodeForPath with invalid path | Robin Appelman | 2015-06-11 | 1 | -6/+56 |
| | | |||||
| * | verify path when getting a node for sabredav | Robin Appelman | 2015-06-11 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #16888 from owncloud/feature/fix-titles | Jan-Christoph Borchardt | 2015-06-12 | 1 | -2/+11 |
|\ \ | | | | | | | fixing setting page titles | ||||
| * | | fixing setting page titles | Clark Tomlinson | 2015-06-11 | 1 | -2/+11 |
| |/ | |||||
* | | Merge pull request #16884 from ↵ | Vincent Petry | 2015-06-12 | 2 | -17/+135 |
|\ \ | | | | | | | | | | | | | owncloud/issue-16843-stop-locking-encryption-key-storage Do not lock the encryption key storage | ||||
| * | | Don't use limit on explode to have only 1 code path | Joas Schilling | 2015-06-12 | 1 | -7/+2 |
| | | | |||||
| * | | Add return value to lock methods and check it in tests | Joas Schilling | 2015-06-12 | 2 | -13/+92 |
| | | | |||||
| * | | Only lock files in data/username/files/ | Joas Schilling | 2015-06-12 | 1 | -9/+53 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-12 | 10 | -8/+126 |
|/ | |||||
* | Merge pull request #16883 from owncloud/revert-16880-webdav-verify-path | Vincent Petry | 2015-06-11 | 1 | -2/+0 |
|\ | | | | | Revert "verify path when getting a node for sabredav" | ||||
| * | Revert "verify path when getting a node for sabredav" | Vincent Petry | 2015-06-11 | 1 | -2/+0 |
|/ | |||||
* | Merge pull request #16880 from owncloud/webdav-verify-path | Vincent Petry | 2015-06-11 | 1 | -0/+2 |
|\ | | | | | verify path when getting a node for sabredav | ||||
| * | verify path when getting a node for sabredav | Robin Appelman | 2015-06-11 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #16879 from jcfischer/jcf_fix_user_delete_message | Lukas Reschke | 2015-06-11 | 2 | -2/+2 |
|\ \ | |/ |/| | Fix error message and add 'user' to it | ||||
| * | Fix test message and add 'user' to it | Jens-Christian Fischer | 2015-06-11 | 1 | -1/+1 |
| | | |||||
| * | Fix error message and add 'user' to it | Jens-Christian Fischer | 2015-06-11 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16872 from owncloud/missing-nullcache-import | Lukas Reschke | 2015-06-11 | 2 | -6/+169 |
|\ \ | |/ |/| | Correctly import NullCache class | ||||
| * | Check the query() for all defined services | Joas Schilling | 2015-06-11 | 1 | -1/+112 |
| | | |||||
| * | Order all use statements correctly | Joas Schilling | 2015-06-11 | 1 | -6/+6 |
| | | |||||
| * | Correctly import NullCache class | Joas Schilling | 2015-06-11 | 2 | -0/+52 |
|/ | |||||
* | Merge pull request #16869 from owncloud/php7 | Morris Jobke | 2015-06-11 | 3 | -6/+4 |
|\ | | | | | Null -> NullCache | ||||
| * | Null -> NullCache | Thomas Müller | 2015-06-11 | 3 | -6/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-11 | 18 | -18/+96 |
|/ | |||||
* | Revert "Null -> NullCache" | Thomas Müller | 2015-06-11 | 2 | -2/+4 |
| | | | | This reverts commit ff24554e76c6ccf7cdb4b5abd82fddaa8d82816c. | ||||
* | Null -> NullCache | Thomas Müller | 2015-06-11 | 2 | -4/+2 |
| | |||||
* | Merge pull request #16860 from owncloud/fix-appmenu | Morris Jobke | 2015-06-10 | 1 | -2/+2 |
|\ | | | | | fix app menu not showing on mobile, fix #16844 | ||||
| * | fix app menu not showing on mobile, fix #16844 | Jan-Christoph Borchardt | 2015-06-10 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #16814 from owncloud/improve-repair | Morris Jobke | 2015-06-10 | 1 | -6/+7 |
|\ \ | | | | | | | Reduce amount of rows to update | ||||
| * | | Fix fetching the mimetype id from the query | Joas Schilling | 2015-06-09 | 1 | -1/+2 |
| | | | |||||
| * | | Reduce amount of rows to update | Victor Dubiniuk | 2015-06-09 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #16736 from owncloud/utilize-member-of | Thomas Müller | 2015-06-10 | 5 | -35/+110 |
|\ \ \ | | | | | | | | | Utilize memberOf to boost loading time on users page (depending on LDAP server config) | ||||
| * | | | if possible, getUserGroups should get memberships using memberOf virtual ↵ | Arthur Schiwon | 2015-06-03 | 4 | -2/+96 |
| | | | | | | | | | | | | | | | | attribute | ||||
| * | | | Implement a faster way for checking availability of memberOf. Users tab in ↵ | Arthur Schiwon | 2015-06-03 | 1 | -33/+14 |
| | | | | | | | | | | | | | | | | the wizard benefits. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-10 | 14 | -10/+182 |
| | | | | |||||
* | | | | Merge pull request #16810 from owncloud/disable-search-if-not-implemented | Thomas Müller | 2015-06-09 | 2 | -12/+25 |
|\ \ \ \ | | | | | | | | | | | Disable search field in case there is no search available to the curr… | ||||
| * | | | | Bring back filtering on apps management page | Thomas Müller | 2015-06-09 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Search results have to explicitly be added to the content area of the app | Thomas Müller | 2015-06-09 | 2 | -8/+6 |
| | | | | | |||||
| * | | | | Disable search field in case there is no search available to the current ↵ | Thomas Müller | 2015-06-08 | 1 | -4/+17 |
| | | | | | | | | | | | | | | | | | | | | selected app - fixes #14544 | ||||
* | | | | | Merge pull request #16840 from owncloud/fix-video-preview | Lukas Reschke | 2015-06-09 | 3 | -1/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Disable video preview if previews are disabled | ||||
| * | | | | Disable video preview if previews are disabled | Morris Jobke | 2015-06-09 | 3 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #16803 from ↵ | Thomas Müller | 2015-06-09 | 2 | -14/+57 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue/16801-group-reshare-part-file-enc-keys Check if the part files has keys when the original file does not | ||||
| * | | | | Add a test for the fallback to the part file keys | Joas Schilling | 2015-06-08 | 1 | -13/+46 |
| | | | | | |||||
| * | | | | Check if the part files has keys when the original file does not | Joas Schilling | 2015-06-08 | 1 | -1/+11 |
| | | | | | |||||
* | | | | | Merge pull request #16818 from owncloud/upgrade-jquery-migrate | Morris Jobke | 2015-06-09 | 8 | -516/+545 |
|\ \ \ \ \ | | | | | | | | | | | | | Upgrade jquery-migrate to 1.2.1 | ||||
| * | | | | | Upgrade jquery-migrate to 1.2.1 | Morris Jobke | 2015-06-09 | 8 | -516/+545 |
| | | | | | | |||||
* | | | | | | Merge pull request #16811 from espenfjo/master | Morris Jobke | 2015-06-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix regression in preview height calculation | ||||
| * | | | | | Fix regression in preview height calculation | Espen Fjellvær Olsen | 2015-06-08 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | Fix regressions introduced in a672e9d regarding the image height calculation |