summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move SharedStorage et al over to the shareManager and jailRoeland Jago Douma2016-04-198-456/+146
* cache the scanner/updater/cache in the wrapper storageRobin Appelman2016-04-192-12/+18
* Merge pull request #23993 from owncloud/update-to-jquery2Thomas Müller2016-04-1915-5257/+4887
|\
| * Turn off jQuery animations when testingChristoph Wurst2016-04-181-0/+2
| * downgrade jquery, update jquery-migrateChristoph Wurst2016-04-1511-3081/+2675
| * add jquery files to gitChristoph Wurst2016-04-144-1/+9848
| * update jquery to version 2.2.3Christoph Wurst2016-04-147-9830/+17
* | Merge pull request #24074 from owncloud/integritycheck_psr4Thomas Müller2016-04-197-1/+1
|\ \
| * | Fix use statementRoeland Jago Douma2016-04-181-1/+1
| * | Move OC\IntegrityCheck to PSR-4Roeland Jago Douma2016-04-187-0/+0
* | | Merge pull request #23903 from owncloud/fix-user-data-folder-creation-for-apa...Thomas Müller2016-04-191-0/+4
|\ \ \
| * | | Fixes #23899Thomas Müller2016-04-111-0/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1994-96/+44
* | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hookThomas Müller2016-04-1910-204/+142
|\ \ \ \
| * | | | Move post_removeFromGroup to shareManagerRoeland Jago Douma2016-04-1310-204/+142
* | | | | Merge pull request #24049 from owncloud/skjnldsv-fix-colors-valuesThomas Müller2016-04-191-1/+7
|\ \ \ \ \
| * | | | | Fix rgb valuesJohn Molakvoæ2016-04-181-1/+7
* | | | | | Merge pull request #24056 from owncloud/move-logout-to-logincontrollerThomas Müller2016-04-1910-38/+95
|\ \ \ \ \ \
| * | | | | | Move logout to controllerLukas Reschke2016-04-1810-38/+95
* | | | | | | Revert "Fix displayname for initial calendars and address books - fixes #24057"Thomas Müller2016-04-182-89/+18
* | | | | | | Fix displayname for initial calendars and address books - fixes #24057Thomas Müller2016-04-182-18/+89
|/ / / / / /
* | | | | | Merge pull request #24037 from owncloud/file_versions_defaultLukas Reschke2016-04-181-3/+3
|\ \ \ \ \ \
| * | | | | | link to file_versioning.rstCarla Schroder2016-04-151-3/+3
* | | | | | | Merge pull request #23911 from owncloud/split-upgrade-commandChristoph Wurst2016-04-1810-319/+434
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove deprecated HTTPHelperThomas Müller2016-04-184-24/+34
| * | | | | | Move version check code out of class UpdaterThomas Müller2016-04-1810-317/+422
* | | | | | | Merge pull request #23922 from owncloud/upgrade-only-with-cli-for-big-install...Thomas Müller2016-04-184-13/+62
|\ \ \ \ \ \ \
| * | | | | | | Suggest cli based updater in case the instance is bigger - #23913Thomas Müller2016-04-184-13/+62
| |/ / / / / /
* | | | | | | Merge pull request #24072 from owncloud/properly-escape-urlThomas Müller2016-04-182-1/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Properly escape URLLukas Reschke2016-04-182-1/+15
* | | | | | | Merge pull request #24058 from owncloud/fix-notification-pathsThomas Müller2016-04-181-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Adjust notification paths to PSR-4Joas Schilling2016-04-181-2/+2
|/ / / / / /
* | | | | | Merge pull request #23947 from owncloud/login-to-ctrlLukas Reschke2016-04-189-49/+398
|\ \ \ \ \ \
| * | | | | | Also check for an empty stringLukas Reschke2016-04-151-4/+4
| * | | | | | Keep used username in URLLukas Reschke2016-04-151-1/+8
| * | | | | | Rename `username` to `loginName`Lukas Reschke2016-04-153-8/+8
| * | | | | | Use !== instead of emptyLukas Reschke2016-04-152-4/+42
| * | | | | | Move login form into controllerLukas Reschke2016-04-159-48/+352
* | | | | | | Merge pull request #24050 from owncloud/notification_psr4Thomas Müller2016-04-183-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move \OC\Notification to PSR-4Roeland Jago Douma2016-04-183-0/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #23268 from owncloud/range-requests-should-not-block-the-s...Thomas Müller2016-04-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Close session for publicwebdavLukas Reschke2016-03-151-0/+1
* | | | | | | Merge pull request #24048 from owncloud/memcache_psr-4Thomas Müller2016-04-1811-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move \OC\Memcache to PSR-4Roeland Jago Douma2016-04-1811-0/+0
|/ / / / / / /
* | | | | | | Merge pull request #24036 from owncloud/db_psr4Morris Jobke2016-04-1731-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move \OC\DB to PSR-4Roeland Jago Douma2016-04-1531-0/+0
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1710-16/+32
* | | | | | | | Merge pull request #23936 from owncloud/update_3rdpartyLukas Reschke2016-04-161-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | update 3rdparty to latest JSqueezeGeorg Ehrke2016-04-121-0/+0
* | | | | | | | | Merge pull request #23978 from owncloud/integration-test-remaining-from-qa-26Lukas Reschke2016-04-162-0/+28
|\ \ \ \ \ \ \ \ \