summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pass on the error message from the user manager to the UI (#24526)Joas Schilling2016-05-112-2/+6
* Use proper URL generation function (#24576)Lukas Reschke2016-05-112-3/+3
* Move Provisioning api to PSR-4 (#24510)Joas Schilling2016-05-118-176/+194
* allow configuration of memcached options (#23729)Jörn Friedrich Dreyer2016-05-112-0/+54
* Merge pull request #24568 from owncloud/fix_24566Thomas Müller2016-05-111-1/+2
|\
| * Fix test race conditionRoeland Jago Douma2016-05-111-1/+2
* | Merge pull request #24531 from owncloud/psr4-loading-for-install-and-commandsThomas Müller2016-05-114-4/+5
|\ \
| * | Correctly register autoloading before install.php and loading commandsJoas Schilling2016-05-114-4/+5
| |/
* | Merge pull request #24189 from owncloud/pluggable-authThomas Müller2016-05-1133-426/+2058
|\ \ | |/ |/|
| * use the UID for creating the session token, not the login nameChristoph Wurst2016-05-115-19/+31
| * create session token for DAV clients (sync clients)Christoph Wurst2016-05-111-0/+1
| * fix login with emailChristoph Wurst2016-05-111-1/+2
| * delete the token in case an exception is thrown when decrypting the passwordChristoph Wurst2016-05-113-6/+50
| * use the query builder instead of raw sql statementsChristoph Wurst2016-05-112-29/+51
| * fix PHPDoc and other minor issuesChristoph Wurst2016-05-1114-68/+77
| * show login errorChristoph Wurst2016-05-111-5/+12
| * catch possible SessionNotAvailableExceptionsChristoph Wurst2016-05-111-6/+23
| * add auth integration testsChristoph Wurst2016-05-113-0/+198
| * PHPDoc and other minor fixesChristoph Wurst2016-05-116-36/+74
| * fix mock builder for old phpunit versionsChristoph Wurst2016-05-113-6/+18
| * add unit tests for all new classesChristoph Wurst2016-05-115-3/+441
| * pass in $request on OCS apiChristoph Wurst2016-05-112-1/+4
| * try apache auth tooChristoph Wurst2016-05-112-8/+24
| * increase token column widthChristoph Wurst2016-05-115-7/+6
| * Fix existing testsChristoph Wurst2016-05-113-119/+139
| * fix LoginController unit testsChristoph Wurst2016-05-112-2/+70
| * fix setupChristoph Wurst2016-05-115-48/+53
| * increase version number to trigger db migrationChristoph Wurst2016-05-111-1/+1
| * Add fallback to allow user:token basic authChristoph Wurst2016-05-111-0/+7
| * Add token auth for OCS APIsChristoph Wurst2016-05-118-44/+73
| * Add index on 'last_activity'Christoph Wurst2016-05-117-8/+42
| * Add controller to generate client tokensChristoph Wurst2016-05-114-1/+94
| * Check if session token is valid and log user out if the check failsChristoph Wurst2016-05-117-25/+107
| * invalidate (delete) session token on logoutChristoph Wurst2016-05-119-8/+139
| * token based authChristoph Wurst2016-05-1116-250/+596
|/
* Merge pull request #24493 from owncloud/command_psr4Thomas Müller2016-05-112-0/+0
|\
| * Move \OCP\Command to PSR-4Roeland Jago Douma2016-05-102-0/+0
* | Merge pull request #24433 from owncloud/user_psr4Thomas Müller2016-05-1119-107/+152
|\ \
| * | fix usage of legacy class in LDAPMorris Jobke2016-05-101-5/+5
| * | Add \OC\User\BackendRoeland Jago Douma2016-05-1010-185/+228
| * | Move OC_User_Database to \OC\User\DatabaseRoeland Jago Douma2016-05-106-24/+26
| * | Move \OC\User to PSR-4Roeland Jago Douma2016-05-105-0/+0
| * | Move OC_User_XX to legacy folderRoeland Jago Douma2016-05-103-0/+0
| |/
* | Merge pull request #24550 from owncloud/kill-en@pirateThomas Müller2016-05-1114-72/+0
|\ \
| * | Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-1114-72/+0
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1112-6/+100
* | Merge pull request #24379 from owncloud/remove-unneeded-codeLukas Reschke2016-05-102-35/+2
|\ \ | |/ |/|
| * Remove unneeded private wrapper methodsMorris Jobke2016-05-022-35/+2
* | Merge pull request #24397 from owncloud/sort-share-linksMorris Jobke2016-05-101-9/+9
|\ \
| * | Reordered share link settingsVincent Chan2016-05-021-9/+9