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

18738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Morris Jobke
aa8f17bc63 Merge pull request #9017 from owncloud/maxheartbeatinterval 
Added max heartbeat interval to prevent integer overflow
 2014-06-13 00:19:07 +02:00
Vincent Petry
6a0f5cfc61 Added unit tests for heartbeat interval min/max values 2014-06-12 18:42:09 +02:00
Vincent Petry
ce168c286a Added max heartbeat interval to prevent integer overflow 
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.

This fix adds a maximum ping interval of 24 hours.

Forward port of 00ec5fc193 from stable6.
 2014-06-12 18:41:19 +02:00
Vincent Petry
b595c982d0 Merge pull request #8968 from owncloud/scanner-parent-repair 
Repair broken parent link in the scanner
 2014-06-12 17:40:44 +02:00
Morris Jobke
ab7cff6dfd Revert "Merge pull request #8998 from macjohnny/master" 
This reverts commit 482eded8b3, reversing
changes made to 354cace14a.
 2014-06-12 14:56:46 +02:00
Vincent Petry
8e463926a0 Merge pull request #9004 from owncloud/cleanup-storages 
Added check and cleanup for storage/filecache
 2014-06-12 14:50:18 +02:00
macjohnny
482eded8b3 Merge pull request #8998 from macjohnny/master 
drastic speedup for nested ldap groups
 2014-06-12 14:49:15 +02:00
Bernhard Posselt
354cace14a Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings 
fix liskov substitution principle in admin mail template settings
 2014-06-12 14:33:13 +02:00
Vincent Petry
19c73a8464 Added check and cleanup for storage/filecache 
Some tests don't clean up the file cache and sometimes entries are
reused by mistake in subsequent test suites.

This cleans up the file cache and storage after every test suite and
also shows an annoying warning.
 2014-06-12 13:45:39 +02:00
Morris Jobke
dff4ad3e00 Merge pull request #8999 from owncloud/issue/8996 
Issue/8996 IE8 issues with the new menu
 2014-06-12 13:34:32 +02:00
Morris Jobke
d17094e0a5 Move IE8 fixes to fixes.css 2014-06-12 13:33:32 +02:00
Vincent Petry
3e1576011f Merge pull request #8980 from owncloud/better-accept-header 
handle http accept headers more gracefully
 2014-06-12 13:28:03 +02:00
Jörn Friedrich Dreyer
72436b68bf fix liskov substitution principle in admin mail template settings, fixes #8997 2014-06-12 12:38:34 +02:00
macjohnny
e8e2e47e68 Update manager.php 2014-06-12 11:29:20 +02:00
macjohnny
b1094cfe82 Update group.php 2014-06-12 11:28:57 +02:00
Joas Schilling
6c0e27ac99 Fix missing caret in header menu for IE8 2014-06-12 11:01:35 +02:00
Joas Schilling
324075bc78 Fix header menu background in IE8 2014-06-12 11:00:44 +02:00
Joas Schilling
7896b866df Reduce size of png files so they match the svg 
Fix #8996
 2014-06-12 10:55:25 +02:00
macjohnny
0af8aa689f drastic speedup for nested ldap groups 
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
  - getGroupObject() (executed for every group!)
     - groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
 2014-06-12 09:51:23 +02:00
macjohnny
ede2aa236e Update manager.php 
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
 2014-06-12 09:41:23 +02:00
Vincent Petry
5def2a72dd Merge pull request #8991 from owncloud/fix-php53-arraycombine 
Fixed array_combine for PHP 5.3
 2014-06-12 09:08:50 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Vincent Petry
4e4c2b04c8 Fixed array_combine for PHP 5.3 2014-06-11 19:13:49 +02:00
Vincent Petry
452b45ed1d Merge pull request #8986 from owncloud/disable_tests 
disable failing tests
 2014-06-11 18:34:35 +02:00
Vincent Petry
75a53b3c49 Merge pull request #8901 from owncloud/permissions-update-cache 
Save the permissions in the filecache if it's not saved yet
 2014-06-11 18:28:55 +02:00
Vincent Petry
67413e3ada Use assertNotSame when checking etags 
Sometimes etags contain a "e" character which makes PHP believe it's a
number and make the tests fail
 2014-06-11 17:28:18 +02:00
Bjoern Schiessle
4cef7f9d4b disable failing tests 2014-06-11 17:21:57 +02:00
Vincent Petry
2facfe9984 Merge pull request #8985 from owncloud/share-grouporderfix 
Added ORDER BY to enforce share entry order
 2014-06-11 17:20:22 +02:00
Vincent Petry
65b3d293ce Added ORDER BY to enforce share entry order 
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.

This fix adds an ORDER BY clause to force the order by id.
 2014-06-11 14:28:30 +02:00
Frank Karlitschek
7742791bc2 increase to 7.0 alpha 1 2014-06-11 10:54:45 +02:00
Vincent Petry
491c96eaa9 Merge pull request #8966 from owncloud/fix_failing_tests_on_master 
Fix failing tests on master
 2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Bernhard Posselt
93169eca1e also handle lowercase headers 2014-06-11 01:20:09 +02:00
Morris Jobke
e89f1784a3 Merge pull request #8972 from owncloud/use_imagettftext_take2 
make text preview backend use imagettftext, fixes #8087
 2014-06-11 01:07:32 +02:00
Bernhard Posselt
0252d39bb6 fix indention 2014-06-11 00:57:00 +02:00
Bernhard Posselt
1002281dae handle http accept headers more gracefully 2014-06-11 00:54:25 +02:00
jbtbnl
077a542d59 Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9 
Disable snapper init for IE <= 9
 2014-06-10 21:59:55 +02:00
Georg Ehrke
e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Vincent Petry
015c5062e5 Disable snapper init for IE <= 9 
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
 2014-06-10 17:14:49 +02:00
Robin Appelman
6b1d8a56bb remove unused argument 2014-06-10 15:42:37 +02:00
Robin Appelman
054083b9cd add some comments 2014-06-10 15:37:43 +02:00
Robin Appelman
21cfd1014a Repair broken parent link in the scanner 2014-06-10 15:26:18 +02:00
Bjoern Schiessle
9dc0befcca call self::getNumericStorageId() to get the numeric ID 2014-06-10 14:48:19 +02:00
Bjoern Schiessle
f4a183e753 wwe no longer have a versions table 2014-06-10 14:47:32 +02:00
Bjoern Schiessle
1d9b4aadbf no need to prepare a statement twice 2014-06-10 14:46:47 +02:00
Morris Jobke
ecc41fe0c3 Merge pull request #8908 from owncloud/fix-placeholders 
fix split translations. fix for the discussion in the description
 2014-06-10 10:47:23 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
jbtbnl
b2c86b7a07 Merge pull request #8928 from owncloud/too-long-filename-fix-v2 
Ellipcises too long filenames
 2014-06-09 13:09:18 +02:00
Robin Appelman
a978607011 Use &= 2014-06-09 12:47:00 +02:00