Commit Graph

25286 Commits

Author SHA1 Message Date
Vincent Petry cda9685c0e Merge pull request #16883 from owncloud/revert-16880-webdav-verify-path
Revert "verify path when getting a node for sabredav"
2015-06-11 15:27:53 +02:00
Vincent Petry f13a2d9251 Revert "verify path when getting a node for sabredav" 2015-06-11 15:25:06 +02:00
Vincent Petry e5c6a9481f Merge pull request #16880 from owncloud/webdav-verify-path
verify path when getting a node for sabredav
2015-06-11 15:17:15 +02:00
Lukas Reschke dbe344ef3d Merge pull request #16879 from jcfischer/jcf_fix_user_delete_message
Fix error message and add 'user' to it
2015-06-11 14:53:50 +02:00
Robin Appelman 4d10dab813 verify path when getting a node for sabredav 2015-06-11 14:12:04 +02:00
Jens-Christian Fischer bffadd069d Fix test message and add 'user' to it 2015-06-11 13:44:38 +02:00
Lukas Reschke fee52f7f44 Merge pull request #16872 from owncloud/missing-nullcache-import
Correctly import NullCache class
2015-06-11 13:35:45 +02:00
Jens-Christian Fischer 0013c4115e Fix error message and add 'user' to it 2015-06-11 13:02:47 +02:00
Joas Schilling afa030c561 Check the query() for all defined services 2015-06-11 12:28:30 +02:00
Joas Schilling 4582d14832 Order all use statements correctly 2015-06-11 11:29:27 +02:00
Joas Schilling 05f1ff8715 Correctly import NullCache class 2015-06-11 10:48:30 +02:00
Morris Jobke 672b8752e4 Merge pull request #16869 from owncloud/php7
Null -> NullCache
2015-06-11 09:29:49 +02:00
Jenkins for ownCloud 88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Thomas Müller 3090348bf7 Null -> NullCache 2015-06-11 00:44:13 +02:00
Thomas Müller 48e915c7be Revert "Null -> NullCache"
This reverts commit ff24554e76.
2015-06-11 00:40:26 +02:00
Thomas Müller ff24554e76 Null -> NullCache 2015-06-11 00:34:03 +02:00
Morris Jobke 5ccacb9b38 Merge pull request #16860 from owncloud/fix-appmenu
fix app menu not showing on mobile, fix #16844
2015-06-10 16:18:31 +02:00
Morris Jobke be6ba653ea Merge pull request #16814 from owncloud/improve-repair
Reduce amount of rows to update
2015-06-10 15:57:21 +02:00
Jan-Christoph Borchardt a8b51fdcbd fix app menu not showing on mobile, fix #16844 2015-06-10 13:43:12 +02:00
Thomas Müller 4747c7f509 Merge pull request #16736 from owncloud/utilize-member-of
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
2015-06-10 08:47:53 +02:00
Jenkins for ownCloud 4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Thomas Müller 5f4f7e69cf Merge pull request #16810 from owncloud/disable-search-if-not-implemented
Disable search field in case there is no search available to the curr…
2015-06-09 23:49:25 +02:00
Lukas Reschke b9c7b5575a Merge pull request #16840 from owncloud/fix-video-preview
Disable video preview if previews are disabled
2015-06-09 22:32:13 +02:00
Morris Jobke 7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Joas Schilling 0235e5edd3 Fix fetching the mimetype id from the query 2015-06-09 16:35:11 +02:00
Thomas Müller e882f5e930 Bring back filtering on apps management page 2015-06-09 15:46:15 +02:00
Thomas Müller 0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Thomas Müller 9d90421e62 Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys
Check if the part files has keys when the original file does not
2015-06-09 11:41:36 +02:00
Morris Jobke 7df96f1922 Merge pull request #16818 from owncloud/upgrade-jquery-migrate
Upgrade jquery-migrate to 1.2.1
2015-06-09 10:20:14 +02:00
Morris Jobke bacd5de453 Merge pull request #16811 from espenfjo/master
Fix regression in preview height calculation
2015-06-09 09:31:30 +02:00
Morris Jobke 7b7b21d328 Upgrade jquery-migrate to 1.2.1 2015-06-09 09:14:42 +02:00
Jenkins for ownCloud 75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Victor Dubiniuk 262d7e659d Reduce amount of rows to update 2015-06-09 01:04:42 +03:00
Morris Jobke 429bd7ce37 Merge pull request #16807 from owncloud/fix-16779
Do not use digits in random index names
2015-06-08 22:28:57 +02:00
Björn Schießle 2ae2da576f Merge pull request #16798 from owncloud/enc_add_hint_to_exception
add hint to exception
2015-06-08 22:28:26 +02:00
Bjoern Schiessle d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen 308b97db4c Fix regression in preview height calculation
Fix regressions introduced in a672e9d regarding the image height calculation
2015-06-08 20:57:19 +02:00
Thomas Müller 0dd990839e Disable search field in case there is no search available to the current selected app - fixes #14544 2015-06-08 20:18:41 +02:00
Victor Dubiniuk c7c6556187 Do not use digits in random index names 2015-06-08 19:02:07 +03:00
Joas Schilling 05c2fc72d8 Add a test for the fallback to the part file keys 2015-06-08 16:35:37 +02:00
Thomas Müller 64c9c27f7e Merge pull request #16382 from 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
2015-06-08 16:14:35 +02:00
Joas Schilling e6681857d2 Check if the part files has keys when the original file does not 2015-06-08 15:42:38 +02:00
Olivier Paroz 3d0a523217 Make sure we have a resource before measuring its size 2015-06-08 15:10:29 +02:00
Thomas Müller 1769de0a6d Merge pull request #16796 from owncloud/fix-login-listener-for-file-cache
Fix login handler for file cache - fixes #16795
2015-06-08 14:59:29 +02:00
Thomas Müller 97a3d8c313 Fix login handler for file cache - fixes #16795 2015-06-08 14:13:38 +02:00
Thomas Müller a968b8409d Merge pull request #16158 from owncloud/mountprovider-after-setup
Call newly registered mount providers after the filesystem is setup
2015-06-08 13:42:02 +02:00
Thomas Müller f051b7381b Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
Sort user groups by group name and hide the user count
2015-06-08 12:11:22 +02:00
Jenkins for ownCloud 2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud 3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Olivier Paroz 71d65cb713 Fix max preview, some resizing and caching issues and force preview 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**
2015-06-06 16:25:04 +02:00