wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25533 commits 157 branches 562 tags 714 MiB
Commit graph

25533 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Joas Schilling
580155abe7 Load the update information asyncroniously to fix the page load speed 2015-06-10 12:11:05 +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
Brewal
6170150ce0 Merge pull request #1 from Brewal/Brewal-patch-1 
Changed a p element by a div
 2015-06-08 15:32:57 +02:00
Brewal
eac117fc8f Changed a p element by a div 
A p element cannot contain a div element (here `<div style="clear: both;"></div>`). It should be change by a div element to fits standards.
 2015-06-08 15:22:52 +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
Jenkins for ownCloud
16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Lukas Reschke
ca10ee4d0d Merge pull request #16771 from owncloud/fix-storage-full-message 
Add owner to the storage stats to enable better notifications
 2015-06-05 20:09:55 +02:00
Morris Jobke
3b188d0b72 Merge pull request #16768 from owncloud/add-missing-mime-types 
Adding mimetype x-h for header files
 2015-06-05 20:08:34 +02:00
Lukas Reschke
cbb15f3cbd Merge pull request #16767 from owncloud/webdav-preventdeleteroot 
Prevent deleting Webdav root
 2015-06-05 19:56:20 +02:00
Vincent Petry
b97be0ea02 Fix sabre directory test cases 
- rely on a mock subfolder instead of the root
- remove obsolete "Shared" limitation tests which did pass but not for the right
  reasons
- added test for the prevention of root deletion
 2015-06-05 19:04:59 +02:00
Morris Jobke
bd5aebe256 Merge pull request #16770 from owncloud/update-ocp-phpdoc 
[OCP] update PHPdoc to contain correct @since tags
 2015-06-05 18:55:45 +02:00