summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-1210-8/+126
|
* Merge pull request #16883 from owncloud/revert-16880-webdav-verify-pathVincent Petry2015-06-111-2/+0
|\ | | | | Revert "verify path when getting a node for sabredav"
| * Revert "verify path when getting a node for sabredav"Vincent Petry2015-06-111-2/+0
|/
* Merge pull request #16880 from owncloud/webdav-verify-pathVincent Petry2015-06-111-0/+2
|\ | | | | verify path when getting a node for sabredav
| * verify path when getting a node for sabredavRobin Appelman2015-06-111-0/+2
| |
* | Merge pull request #16879 from jcfischer/jcf_fix_user_delete_messageLukas Reschke2015-06-112-2/+2
|\ \ | |/ |/| Fix error message and add 'user' to it
| * Fix test message and add 'user' to itJens-Christian Fischer2015-06-111-1/+1
| |
| * Fix error message and add 'user' to itJens-Christian Fischer2015-06-111-1/+1
| |
* | Merge pull request #16872 from owncloud/missing-nullcache-importLukas Reschke2015-06-112-6/+169
|\ \ | |/ |/| Correctly import NullCache class
| * Check the query() for all defined servicesJoas Schilling2015-06-111-1/+112
| |
| * Order all use statements correctlyJoas Schilling2015-06-111-6/+6
| |
| * Correctly import NullCache classJoas Schilling2015-06-112-0/+52
|/
* Merge pull request #16869 from owncloud/php7Morris Jobke2015-06-113-6/+4
|\ | | | | Null -> NullCache
| * Null -> NullCacheThomas Müller2015-06-113-6/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1118-18/+96
|/
* Revert "Null -> NullCache"Thomas Müller2015-06-112-2/+4
| | | | This reverts commit ff24554e76c6ccf7cdb4b5abd82fddaa8d82816c.
* Null -> NullCacheThomas Müller2015-06-112-4/+2
|
* Merge pull request #16860 from owncloud/fix-appmenuMorris Jobke2015-06-101-2/+2
|\ | | | | fix app menu not showing on mobile, fix #16844
| * fix app menu not showing on mobile, fix #16844Jan-Christoph Borchardt2015-06-101-2/+2
| |
* | Merge pull request #16814 from owncloud/improve-repairMorris Jobke2015-06-101-6/+7
|\ \ | | | | | | Reduce amount of rows to update
| * | Fix fetching the mimetype id from the queryJoas Schilling2015-06-091-1/+2
| | |
| * | Reduce amount of rows to updateVictor Dubiniuk2015-06-091-6/+6
| | |
* | | Merge pull request #16736 from owncloud/utilize-member-ofThomas Müller2015-06-105-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 Schiwon2015-06-034-2/+96
| | | | | | | | | | | | | | | | attribute
| * | | Implement a faster way for checking availability of memberOf. Users tab in ↵Arthur Schiwon2015-06-031-33/+14
| | | | | | | | | | | | | | | | the wizard benefits.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1014-10/+182
| | | |
* | | | Merge pull request #16810 from owncloud/disable-search-if-not-implementedThomas Müller2015-06-092-12/+25
|\ \ \ \ | | | | | | | | | | Disable search field in case there is no search available to the curr…
| * | | | Bring back filtering on apps management pageThomas Müller2015-06-091-1/+3
| | | | |
| * | | | Search results have to explicitly be added to the content area of the appThomas Müller2015-06-092-8/+6
| | | | |
| * | | | Disable search field in case there is no search available to the current ↵Thomas Müller2015-06-081-4/+17
| | | | | | | | | | | | | | | | | | | | selected app - fixes #14544
* | | | | Merge pull request #16840 from owncloud/fix-video-previewLukas Reschke2015-06-093-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | Disable video preview if previews are disabled
| * | | | Disable video preview if previews are disabledMorris Jobke2015-06-093-1/+3
|/ / / /
* | | | Merge pull request #16803 from ↵Thomas Müller2015-06-092-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 keysJoas Schilling2015-06-081-13/+46
| | | | |
| * | | | Check if the part files has keys when the original file does notJoas Schilling2015-06-081-1/+11
| | | | |
* | | | | Merge pull request #16818 from owncloud/upgrade-jquery-migrateMorris Jobke2015-06-098-516/+545
|\ \ \ \ \ | | | | | | | | | | | | Upgrade jquery-migrate to 1.2.1
| * | | | | Upgrade jquery-migrate to 1.2.1Morris Jobke2015-06-098-516/+545
| | | | | |
* | | | | | Merge pull request #16811 from espenfjo/masterMorris Jobke2015-06-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix regression in preview height calculation
| * | | | | Fix regression in preview height calculationEspen Fjellvær Olsen2015-06-081-1/+1
| | |/ / / | |/| | | | | | | | Fix regressions introduced in a672e9d regarding the image height calculation
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0918-38/+468
| |_|_|/ |/| | |
* | | | Merge pull request #16807 from owncloud/fix-16779Morris Jobke2015-06-081-1/+1
|\ \ \ \ | | | | | | | | | | Do not use digits in random index names
| * | | | Do not use digits in random index namesVictor Dubiniuk2015-06-081-1/+1
| |/ / /
* | | | Merge pull request #16798 from owncloud/enc_add_hint_to_exceptionBjörn Schießle2015-06-081-5/+4
|\ \ \ \ | |/ / / |/| | | add hint to exception
| * | | add hint to exceptionBjoern Schiessle2015-06-081-5/+4
| | | |
* | | | Merge pull request #16382 from ↵Thomas Müller2015-06-0825-431/+2067
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | oparoz/providers-are-responsible-for-the-size-of-their-preview Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
| * | | Make sure we have a resource before measuring its sizeOlivier Paroz2015-06-081-1/+5
| | | |
| * | | Fix max preview, some resizing and caching issues and force preview ↵Olivier Paroz2015-06-0625-431/+2063
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | providers to resize their previews properly * introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box * adds the method to all key providers so that they can do their job, as expected by the Preview class * improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space * fixes some long standing issues * **contains mostly tests**
* | | | Merge pull request #16796 from owncloud/fix-login-listener-for-file-cacheThomas Müller2015-06-082-6/+4
|\ \ \ \ | | | | | | | | | | Fix login handler for file cache - fixes #16795
| * | | | Fix login handler for file cache - fixes #16795Thomas Müller2015-06-082-6/+4
|/ / / /
* | | | Merge pull request #16158 from owncloud/mountprovider-after-setupThomas Müller2015-06-0813-97/+206
|\ \ \ \ | | | | | | | | | | Call newly registered mount providers after the filesystem is setup