a6e45a8d0e
use more stuff from core :)
2014-06-13 15:34:52 +02:00
e026b1dc19
Add missing use
2014-06-13 15:34:52 +02:00
59ff71f781
Fix check for user existence
2014-06-13 15:34:52 +02:00
47c6fd0c85
Remove debug output
2014-06-13 15:34:52 +02:00
4b359ad20c
Change routes. Update templates
2014-06-13 15:34:52 +02:00
218d0add36
Changes according to review
2014-06-13 15:34:52 +02:00
a7fbd91e53
Use appframework
2014-06-13 15:34:52 +02:00
23ed038a27
Basics
2014-06-13 15:34:51 +02:00
c09f5680c9
Merge pull request #9010 from owncloud/fix_8941_admin_settings_message
...
move mail template settings to templateeditor repo
2014-06-13 13:07:41 +02:00
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
b91db84050
Merge pull request #8714 from owncloud/minor-fixes
...
fix some minor issues
2014-06-13 08:30:57 +02:00
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
aa8f17bc63
Merge pull request #9017 from owncloud/maxheartbeatinterval
...
Added max heartbeat interval to prevent integer overflow
2014-06-13 00:19:07 +02:00
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
6a0f5cfc61
Added unit tests for heartbeat interval min/max values
2014-06-12 18:42:09 +02:00
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
2014-06-12 18:41:19 +02:00
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
ab7cff6dfd
Revert "Merge pull request #8998 from macjohnny/master"
...
This reverts commit 482eded8b3354cace14a
2014-06-12 14:56:46 +02:00
8e463926a0
Merge pull request #9004 from owncloud/cleanup-storages
...
Added check and cleanup for storage/filecache
2014-06-12 14:50:18 +02:00
482eded8b3
Merge pull request #8998 from macjohnny/master
...
drastic speedup for nested ldap groups
2014-06-12 14:49:15 +02:00
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
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
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
d17094e0a5
Move IE8 fixes to fixes.css
2014-06-12 13:33:32 +02:00
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
72436b68bf
fix liskov substitution principle in admin mail template settings, fixes #8997
2014-06-12 12:38:34 +02:00
e8e2e47e68
Update manager.php
2014-06-12 11:29:20 +02:00
b1094cfe82
Update group.php
2014-06-12 11:28:57 +02:00
6c0e27ac99
Fix missing caret in header menu for IE8
2014-06-12 11:01:35 +02:00
324075bc78
Fix header menu background in IE8
2014-06-12 11:00:44 +02:00
7896b866df
Reduce size of png files so they match the svg
...
Fix #8996
2014-06-12 10:55:25 +02:00
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
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
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
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
4e4c2b04c8
Fixed array_combine for PHP 5.3
2014-06-11 19:13:49 +02:00
452b45ed1d
Merge pull request #8986 from owncloud/disable_tests
...
disable failing tests
2014-06-11 18:34:35 +02:00
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
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
4cef7f9d4b
disable failing tests
2014-06-11 17:21:57 +02:00
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
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
7742791bc2
increase to 7.0 alpha 1
2014-06-11 10:54:45 +02:00
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
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
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
0252d39bb6
fix indention
2014-06-11 00:57:00 +02:00
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
Bernhard Posselt
Victor Dubiniuk
Morris Jobke
Jörn Friedrich Dreyer
Jenkins for ownCloud
Volkan Gezer
Vincent Petry
macjohnny
Bernhard Posselt
Joas Schilling
Bjoern Schiessle
Frank Karlitschek