Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added RepairStep interface and default repair step lists | Vincent Petry | 2014-06-12 | 6 | -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 classes | Vincent Petry | 2014-06-12 | 2 | -3/+56 |
| | | | | | This also makes it possible to unit test each repair step class individually | ||||
* | Revert "Merge pull request #8998 from macjohnny/master" | Morris Jobke | 2014-06-12 | 2 | -13/+6 |
| | | | | | This reverts commit 482eded8b31b257dfed7761c7cb43f35ddcd3408, reversing changes made to 354cace14ae01e7ff34af3c8a4a3335b89596da3. | ||||
* | Merge pull request #9004 from owncloud/cleanup-storages | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
|\ | | | | | Added check and cleanup for storage/filecache | ||||
| * | Added check and cleanup for storage/filecache | Vincent Petry | 2014-06-12 | 1 | -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/master | macjohnny | 2014-06-12 | 2 | -6/+13 |
|\ \ | | | | | | | drastic speedup for nested ldap groups | ||||
| * | | Update manager.php | macjohnny | 2014-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | Update group.php | macjohnny | 2014-06-12 | 1 | -6/+0 |
| | | | |||||
| * | | drastic speedup for nested ldap groups | macjohnny | 2014-06-12 | 1 | -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.php | macjohnny | 2014-06-12 | 1 | -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 Posselt | 2014-06-12 | 2 | -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 #8997 | Jörn Friedrich Dreyer | 2014-06-12 | 2 | -2/+2 |
| |/ | |||||
* | | Merge pull request #8999 from owncloud/issue/8996 | Morris Jobke | 2014-06-12 | 4 | -1/+6 |
|\ \ | | | | | | | Issue/8996 IE8 issues with the new menu | ||||
| * | | Move IE8 fixes to fixes.css | Morris Jobke | 2014-06-12 | 2 | -1/+5 |
| | | | |||||
| * | | Fix missing caret in header menu for IE8 | Joas Schilling | 2014-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fix header menu background in IE8 | Joas Schilling | 2014-06-12 | 1 | -0/+1 |
| | | | |||||
| * | | Reduce size of png files so they match the svg | Joas Schilling | 2014-06-12 | 2 | -0/+0 |
| | | | | | | | | | | | | Fix #8996 | ||||
* | | | Merge pull request #8980 from owncloud/better-accept-header | Vincent Petry | 2014-06-12 | 3 | -20/+69 |
|\ \ \ | |_|/ |/| | | handle http accept headers more gracefully | ||||
| * | | also handle lowercase headers | Bernhard Posselt | 2014-06-11 | 2 | -22/+31 |
| | | | |||||
| * | | fix indention | Bernhard Posselt | 2014-06-11 | 1 | -6/+6 |
| | | | |||||
| * | | handle http accept headers more gracefully | Bernhard Posselt | 2014-06-11 | 3 | -18/+58 |
| | | | |||||
* | | | Merge pull request #8991 from owncloud/fix-php53-arraycombine | Vincent Petry | 2014-06-12 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | Fixed array_combine for PHP 5.3 | ||||
| * | | | Fixed array_combine for PHP 5.3 | Vincent Petry | 2014-06-11 | 1 | -2/+7 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-12 | 54 | -197/+275 |
| | | | | |||||
* | | | | Merge pull request #8986 from owncloud/disable_tests | Vincent Petry | 2014-06-11 | 2 | -3/+9 |
|\| | | | | | | | | | | | disable failing tests | ||||
| * | | | Use assertNotSame when checking etags | Vincent Petry | 2014-06-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Sometimes etags contain a "e" character which makes PHP believe it's a number and make the tests fail | ||||
| * | | | disable failing tests | Bjoern Schiessle | 2014-06-11 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #8901 from owncloud/permissions-update-cache | Vincent Petry | 2014-06-11 | 3 | -22/+56 |
|\ \ \ \ | |/ / / |/| | | | Save the permissions in the filecache if it's not saved yet | ||||
| * | | | Use &= | Robin Appelman | 2014-06-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | adjust unit test assert values | Thomas Müller | 2014-06-09 | 1 | -8/+6 |
| | | | | |||||
| * | | | adding PHPDoc | Thomas Müller | 2014-06-09 | 1 | -0/+36 |
| | | | | |||||
| * | | | Save the permissions in the filecache if it's not saved yet | Robin Appelman | 2014-06-09 | 1 | -12/+12 |
| | | | | |||||
* | | | | Merge pull request #8985 from owncloud/share-grouporderfix | Vincent Petry | 2014-06-11 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Added ORDER BY to enforce share entry order | ||||
| * | | | Added ORDER BY to enforce share entry order | Vincent Petry | 2014-06-11 | 1 | -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 1 | Frank Karlitschek | 2014-06-11 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #8966 from owncloud/fix_failing_tests_on_master | Vincent Petry | 2014-06-11 | 5 | -30/+1 |
|\ \ \ | | | | | | | | | Fix failing tests on master | ||||
| * | | | call self::getNumericStorageId() to get the numeric ID | Bjoern Schiessle | 2014-06-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | wwe no longer have a versions table | Bjoern Schiessle | 2014-06-10 | 3 | -28/+0 |
| | | | | |||||
| * | | | no need to prepare a statement twice | Bjoern Schiessle | 2014-06-10 | 1 | -1/+0 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-11 | 221 | -1057/+1573 |
| | | | | |||||
* | | | | Merge pull request #8972 from owncloud/use_imagettftext_take2 | Morris Jobke | 2014-06-11 | 2 | -2/+6 |
|\ \ \ \ | |_|_|/ |/| | | | make text preview backend use imagettftext, fixes #8087 | ||||
| * | | | make text preview backend use imagettftext, fixes #8087 | Georg Ehrke | 2014-06-10 | 2 | -2/+6 |
| | | | | |||||
* | | | | Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9 | jbtbnl | 2014-06-10 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Disable snapper init for IE <= 9 | ||||
| * | | | | Disable snapper init for IE <= 9 | Vincent Petry | 2014-06-10 | 1 | -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-placeholders | Morris Jobke | 2014-06-10 | 3 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | fix split translations. fix for the discussion in the description | ||||
| * | | | fix split translations | Volkan Gezer | 2014-06-06 | 3 | -5/+5 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-10 | 102 | -245/+278 |
| | | | | |||||
* | | | | Merge pull request #8928 from owncloud/too-long-filename-fix-v2 | jbtbnl | 2014-06-09 | 3 | -6/+58 |
|\ \ \ \ | |_|_|/ |/| | | | Ellipcises too long filenames | ||||
| * | | | improve ellipsis of filename for different screen sizes | Morris Jobke | 2014-06-08 | 2 | -19/+22 |
| | | | | |||||
| * | | | @jancborchardt's commit for cross browser compatibility of extension. | raghunayyar | 2014-06-08 | 1 | -3/+1 |
| | | | |