Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use appframework | Victor Dubiniuk | 2014-06-13 | 8 | -200/+229 |
* | Basics | Victor Dubiniuk | 2014-06-13 | 7 | -48/+228 |
* | Merge pull request #9010 from owncloud/fix_8941_admin_settings_message | Morris Jobke | 2014-06-13 | 10 | -457/+0 |
|\ | |||||
| * | move mail template editor from core to standalone templateeditor repo | Jörn Friedrich Dreyer | 2014-06-13 | 10 | -457/+0 |
| * | access admin settings result message correctly | Jörn Friedrich Dreyer | 2014-06-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #8714 from owncloud/minor-fixes | Morris Jobke | 2014-06-13 | 2 | -4/+4 |
|\ | |||||
| * | fix some minor issues | Volkan Gezer | 2014-06-13 | 2 | -4/+4 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-13 | 42 | -186/+263 |
* | | Merge pull request #9017 from owncloud/maxheartbeatinterval | Morris Jobke | 2014-06-13 | 2 | -1/+28 |
|\ \ | |/ |/| | |||||
| * | Added unit tests for heartbeat interval min/max values | Vincent Petry | 2014-06-12 | 1 | -1/+23 |
| * | Added max heartbeat interval to prevent integer overflow | Vincent Petry | 2014-06-12 | 1 | -0/+5 |
* | | Merge pull request #8968 from owncloud/scanner-parent-repair | Vincent Petry | 2014-06-12 | 2 | -39/+89 |
|\ \ | |/ |/| | |||||
| * | remove unused argument | Robin Appelman | 2014-06-10 | 1 | -3/+2 |
| * | add some comments | Robin Appelman | 2014-06-10 | 1 | -0/+2 |
| * | Repair broken parent link in the scanner | Robin Appelman | 2014-06-10 | 2 | -36/+85 |
* | | Revert "Merge pull request #8998 from macjohnny/master" | Morris Jobke | 2014-06-12 | 2 | -13/+6 |
* | | Merge pull request #9004 from owncloud/cleanup-storages | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
|\ \ | |||||
| * | | Added check and cleanup for storage/filecache | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
* | | | Merge pull request #8998 from macjohnny/master | macjohnny | 2014-06-12 | 2 | -6/+13 |
|\ \ \ | |||||
| * | | | 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 |
| * | | | Update manager.php | macjohnny | 2014-06-12 | 1 | -0/+12 |
| |/ / | |||||
* | | | Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_sett... | Bernhard Posselt | 2014-06-12 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | Merge pull request #8980 from owncloud/better-accept-header | Vincent Petry | 2014-06-12 | 3 | -20/+69 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | 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 | 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 |
|\| | | | | |||||
| * | | | | Use assertNotSame when checking etags | Vincent Petry | 2014-06-11 | 1 | -3/+3 |
| * | | | | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 | Vincent Petry | 2014-06-11 | 1 | -0/+1 |
* | | | | | 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 |
|\ \ \ \ | |||||
| * | | | | call self::getNumericStorageId() to get the numeric ID | Bjoern Schiessle | 2014-06-10 | 1 | -1/+1 |