summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24735 from juliushaertl/passwordreset-invalidVincent Petry2016-05-251-15/+35
|\
| * Show error messages if a password reset link is invalid or expiredJulius Haertl2016-05-231-15/+35
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-256-0/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-248-0/+84
* | when generating browser/device token, save the login name for later password ...Christoph Wurst2016-05-243-5/+5
* | generate device token for UID, not login nameChristoph Wurst2016-05-241-2/+3
* | login explicitlyChristoph Wurst2016-05-241-0/+3
* | Merge pull request #24559 from owncloud/2faVincent Petry2016-05-2311-3/+465
|\ \ | |/ |/|
| * add OCC command to enable/disable 2FA for a userChristoph Wurst2016-05-234-0/+141
| * Add two factor auth to coreChristoph Wurst2016-05-238-3/+324
* | Merge pull request #24613 from owncloud/chunked-convert-database-queriesVincent Petry2016-05-231-14/+56
|\ \ | |/ |/|
| * Chunk the "db:convert-type" select queries, to not run out of memory so fastJoas Schilling2016-05-131-14/+56
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-2310-0/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-2258-64/+6
* | Merge pull request #24307 from owncloud/systemtags-perminterfaceVincent Petry2016-05-216-27/+67
|\ \
| * | Rename "not-assignble" to "restricted"Vincent Petry2016-05-203-3/+3
| * | Add app to shipped.jsonVincent Petry2016-05-201-0/+1
| * | Act on effective system tag canAssign permissionVincent Petry2016-05-203-25/+64
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-212-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-202-2/+2
* | Merge pull request #24657 from owncloud/fix-libreoffice-templatesVincent Petry2016-05-183-0/+0
|\ \
| * | Fix #24655Thomas Müller2016-05-173-0/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-182-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-172-0/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-156-10/+18
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-136-16/+44
* Show login error message correctly (#24599)Christoph Wurst2016-05-121-1/+0
* Do not automatically try to enable index.php-less URLs (#24539)Lukas Reschke2016-05-122-0/+45
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-122-2/+2
* Use proper URL generation function (#24576)Lukas Reschke2016-05-111-1/+1
* use the UID for creating the session token, not the login nameChristoph Wurst2016-05-111-4/+4
* fix login with emailChristoph Wurst2016-05-111-1/+2
* fix PHPDoc and other minor issuesChristoph Wurst2016-05-112-4/+3
* show login errorChristoph Wurst2016-05-111-5/+12
* PHPDoc and other minor fixesChristoph Wurst2016-05-111-2/+4
* add unit tests for all new classesChristoph Wurst2016-05-111-3/+3
* increase token column widthChristoph Wurst2016-05-111-2/+1
* fix LoginController unit testsChristoph Wurst2016-05-111-1/+1
* fix setupChristoph Wurst2016-05-111-4/+11
* Add token auth for OCS APIsChristoph Wurst2016-05-112-3/+7
* Add index on 'last_activity'Christoph Wurst2016-05-111-2/+3
* Add controller to generate client tokensChristoph Wurst2016-05-113-0/+93
* Check if session token is valid and log user out if the check failsChristoph Wurst2016-05-111-1/+0
* token based authChristoph Wurst2016-05-114-29/+64
* Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-112-10/+0
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-112-0/+2
* Merge pull request #24397 from owncloud/sort-share-linksMorris Jobke2016-05-101-9/+9
|\
| * Reordered share link settingsVincent Chan2016-05-021-9/+9
* | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-102-3/+45
|\ \
| * | Do not encode slashes in "dir" URL param in files JSVincent Petry2016-05-061-1/+6