aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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
* | Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-122-39/+89
|\ \ | |/ |/|
| * 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
* | Merge pull request #9004 from owncloud/cleanup-storagesVincent Petry2014-06-121-0/+26
|\ \
| * | Added check and cleanup for storage/filecacheVincent Petry2014-06-121-0/+26
* | | Merge pull request #8998 from macjohnny/mastermacjohnny2014-06-122-6/+13
|\ \ \
| * | | Update manager.phpmacjohnny2014-06-121-1/+1
| * | | Update group.phpmacjohnny2014-06-121-6/+0
| * | | drastic speedup for nested ldap groupsmacjohnny2014-06-121-2/+3
| * | | Update manager.phpmacjohnny2014-06-121-0/+12
| |/ /
* | | Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_sett...Bernhard Posselt2014-06-122-2/+2
|\ \ \
| * | | 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
|\ \ \
| * | | 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
* | | | Merge pull request #8980 from owncloud/better-accept-headerVincent Petry2014-06-123-20/+69
|\ \ \ \ | |_|/ / |/| | |
| * | | 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.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
|\| | | |
| * | | | Use assertNotSame when checking etagsVincent Petry2014-06-111-3/+3
| * | | | disable failing testsBjoern Schiessle2014-06-111-0/+6
* | | | | Merge pull request #8901 from owncloud/permissions-update-cacheVincent Petry2014-06-113-22/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 orderVincent Petry2014-06-111-0/+1
* | | | | 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
|\ \ \ \
| * | | | call self::getNumericStorageId() to get the numeric IDBjoern Schiessle2014-06-101-1/+1