summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added RepairStep interface and default repair step listsVincent Petry2014-06-126-69/+304
| | | | | | | | | | | The updater is using "before update" repair steps and "regular" repair steps. The "regular" repair steps are also used by the CLI tool. Currently no steps exist but can be added later in the static methods in the \OC\Repair class. Added unit test to test messaging, error and exception cases.
* Add support for repair step classesVincent Petry2014-06-122-3/+56
| | | | | This also makes it possible to unit test each repair step class individually
* 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
| * | | Use &=Robin Appelman2014-06-091-2/+2
| | | |
| * | | adjust unit test assert valuesThomas Müller2014-06-091-8/+6
| | | |
| * | | adding PHPDocThomas Müller2014-06-091-0/+36
| | | |
| * | | Save the permissions in the filecache if it's not saved yetRobin Appelman2014-06-091-12/+12
| | | |
* | | | Merge pull request #8985 from owncloud/share-grouporderfixVincent Petry2014-06-111-0/+1
|\ \ \ \ | |_|_|/ |/| | | Added ORDER BY to enforce share entry order
| * | | Added ORDER BY to enforce share entry orderVincent Petry2014-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | increase to 7.0 alpha 1Frank Karlitschek2014-06-111-2/+2
|/ / /
* | | Merge pull request #8966 from owncloud/fix_failing_tests_on_masterVincent Petry2014-06-115-30/+1
|\ \ \ | | | | | | | | Fix failing tests on master
| * | | call self::getNumericStorageId() to get the numeric IDBjoern Schiessle2014-06-101-1/+1
| | | |
| * | | wwe no longer have a versions tableBjoern Schiessle2014-06-103-28/+0
| | | |
| * | | no need to prepare a statement twiceBjoern Schiessle2014-06-101-1/+0
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-11221-1057/+1573
| | | |
* | | | Merge pull request #8972 from owncloud/use_imagettftext_take2Morris Jobke2014-06-112-2/+6
|\ \ \ \ | |_|_|/ |/| | | make text preview backend use imagettftext, fixes #8087
| * | | make text preview backend use imagettftext, fixes #8087Georg Ehrke2014-06-102-2/+6
| | | |
* | | | Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9jbtbnl2014-06-101-1/+1
|\ \ \ \ | | | | | | | | | | Disable snapper init for IE <= 9
| * | | | Disable snapper init for IE <= 9Vincent Petry2014-06-101-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #8908 from owncloud/fix-placeholdersMorris Jobke2014-06-103-5/+5
|\ \ \ \ | |/ / / |/| | | fix split translations. fix for the discussion in the description
| * | | fix split translationsVolkan Gezer2014-06-063-5/+5
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-10102-245/+278
| | | |
* | | | Merge pull request #8928 from owncloud/too-long-filename-fix-v2jbtbnl2014-06-093-6/+58
|\ \ \ \ | |_|_|/ |/| | | Ellipcises too long filenames
| * | | improve ellipsis of filename for different screen sizesMorris Jobke2014-06-082-19/+22
| | | |
| * | | @jancborchardt's commit for cross browser compatibility of extension.raghunayyar2014-06-081-3/+1
| | | |