summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove infield label, add password icon, fix layoutMorris Jobke2014-06-133-2/+12
|
* reformat method call and fix paranthesis mismatchMorris Jobke2014-06-131-8/+8
|
* more style fixesBernhard Posselt2014-06-131-15/+24
|
* use more stuff from core :)Bernhard Posselt2014-06-133-76/+113
|
* Add missing useVictor Dubiniuk2014-06-131-0/+1
|
* Fix check for user existenceVictor Dubiniuk2014-06-131-1/+2
|
* Remove debug outputVictor Dubiniuk2014-06-131-1/+0
|
* Change routes. Update templatesVictor Dubiniuk2014-06-135-24/+27
|
* Changes according to reviewVictor Dubiniuk2014-06-135-156/+154
|
* Use appframeworkVictor Dubiniuk2014-06-138-200/+229
|
* BasicsVictor Dubiniuk2014-06-137-48/+228
|
* Merge pull request #9010 from owncloud/fix_8941_admin_settings_messageMorris Jobke2014-06-1310-457/+0
|\ | | | | move mail template settings to templateeditor repo
| * move mail template editor from core to standalone templateeditor repoJörn Friedrich Dreyer2014-06-1310-457/+0
| |
| * access admin settings result message correctlyJörn Friedrich Dreyer2014-06-131-1/+1
|/
* Merge pull request #8714 from owncloud/minor-fixesMorris Jobke2014-06-132-4/+4
|\ | | | | fix some minor issues
| * fix some minor issuesVolkan Gezer2014-06-132-4/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1342-186/+263
| |
* | Merge pull request #9017 from owncloud/maxheartbeatintervalMorris Jobke2014-06-132-1/+28
|\ \ | |/ |/| Added max heartbeat interval to prevent integer overflow
| * Added unit tests for heartbeat interval min/max valuesVincent Petry2014-06-121-1/+23
| |
| * Added max heartbeat interval to prevent integer overflowVincent Petry2014-06-121-0/+5
| | | | | | | | | | | | | | | | | | | | 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 00ec5fc1935c946e846a8ff28491e5b5b017b3d7 from stable6.
* | Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-122-39/+89
|\ \ | |/ |/| Repair broken parent link in the scanner
| * remove unused argumentRobin Appelman2014-06-101-3/+2
| |
| * add some commentsRobin Appelman2014-06-101-0/+2
| |
| * Repair broken parent link in the scannerRobin Appelman2014-06-102-36/+85
| |
* | Revert "Merge pull request #8998 from macjohnny/master"Morris Jobke2014-06-122-13/+6
| | | | | | | | | | This reverts commit 482eded8b31b257dfed7761c7cb43f35ddcd3408, reversing changes made to 354cace14ae01e7ff34af3c8a4a3335b89596da3.
* | Merge pull request #9004 from owncloud/cleanup-storagesVincent Petry2014-06-121-0/+26
|\ \ | | | | | | Added check and cleanup for storage/filecache
| * | Added check and cleanup for storage/filecacheVincent Petry2014-06-121-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #8998 from macjohnny/mastermacjohnny2014-06-122-6/+13
|\ \ \ | | | | | | | | drastic speedup for nested ldap groups
| * | | Update manager.phpmacjohnny2014-06-121-1/+1
| | | |
| * | | Update group.phpmacjohnny2014-06-121-6/+0
| | | |
| * | | drastic speedup for nested ldap groupsmacjohnny2014-06-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Update manager.phpmacjohnny2014-06-121-0/+12
| |/ / | | | | | | add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
* | | Merge pull request #9003 from ↵Bernhard Posselt2014-06-122-2/+2
|\ \ \ | | | | | | | | | | | | | | | | owncloud/fix_liskov_in_admin_mail_template_settings fix liskov substitution principle in admin mail template settings
| * | | fix liskov substitution principle in admin mail template settings, fixes #8997Jörn Friedrich Dreyer2014-06-122-2/+2
| |/ /
* | | Merge pull request #8999 from owncloud/issue/8996Morris Jobke2014-06-124-1/+6
|\ \ \ | | | | | | | | Issue/8996 IE8 issues with the new menu
| * | | Move IE8 fixes to fixes.cssMorris Jobke2014-06-122-1/+5
| | | |
| * | | Fix missing caret in header menu for IE8Joas Schilling2014-06-121-1/+1
| | | |
| * | | Fix header menu background in IE8Joas Schilling2014-06-121-0/+1
| | | |
| * | | Reduce size of png files so they match the svgJoas Schilling2014-06-122-0/+0
| | | | | | | | | | | | | | | | Fix #8996
* | | | Merge pull request #8980 from owncloud/better-accept-headerVincent Petry2014-06-123-20/+69
|\ \ \ \ | |_|/ / |/| | | handle http accept headers more gracefully
| * | | also handle lowercase headersBernhard Posselt2014-06-112-22/+31
| | | |
| * | | fix indentionBernhard Posselt2014-06-111-6/+6
| | | |
| * | | handle http accept headers more gracefullyBernhard Posselt2014-06-113-18/+58
| | | |
* | | | Merge pull request #8991 from owncloud/fix-php53-arraycombineVincent Petry2014-06-121-2/+7
|\ \ \ \ | | | | | | | | | | Fixed array_combine for PHP 5.3
| * | | | Fixed array_combine for PHP 5.3Vincent Petry2014-06-111-2/+7
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1254-197/+275
| | | | |
* | | | | Merge pull request #8986 from owncloud/disable_testsVincent Petry2014-06-112-3/+9
|\| | | | | | | | | | | | | | disable failing tests
| * | | | Use assertNotSame when checking etagsVincent Petry2014-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Sometimes etags contain a "e" character which makes PHP believe it's a number and make the tests fail
| * | | | disable failing testsBjoern Schiessle2014-06-111-0/+6
| | | | |
* | | | | Merge pull request #8901 from owncloud/permissions-update-cacheVincent Petry2014-06-113-22/+56
|\ \ \ \ \ | |/ / / / |/| | | | Save the permissions in the filecache if it's not saved yet
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 01:37:14 +0000