summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-085-1/+21
|\
| * Allow to cancel 2FA after loginJoas Schilling2016-06-075-1/+21
* | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-082-12/+27
|\ \
| * | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-072-12/+27
| |/
* | Merge pull request #24992 from owncloud/fix_decrypt_messageVincent Petry2016-06-081-1/+10
|\ \
| * | Fixed reviewsSergio BertolĂ­n2016-06-071-2/+2
| * | Comments fixeddavitol2016-06-061-3/+2
| * | Fix Decrypt message via occdavitol2016-06-061-1/+11
* | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-onlyVincent Petry2016-06-081-1/+2
|\ \ \
| * | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-071-1/+2
| | |/ | |/|
* / | darker background image for better font contrastChristoph Wurst2016-06-081-0/+0
|/ /
* / Remove background from curved logo (#24980)William Bargent2016-06-061-0/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-042-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-032-150/+150
* Merge pull request #24947 from owncloud/2fa-remember-redirect-urlVincent Petry2016-06-024-8/+38
|\
| * remember redirect_url when solving the 2FA challengeChristoph Wurst2016-06-014-8/+38
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-022-14/+40
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-012-0/+44
* Merge pull request #24795 from owncloud/issue-24789-reset-password-link-new-w...Vincent Petry2016-05-312-2/+3
|\
| * Allow opening the password reset link in a new window when its a URLJoas Schilling2016-05-242-2/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-312-0/+8
* | Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cueVincent Petry2016-05-301-1/+3
|\ \
| * | Fix breadcrumb background right arrow due to incorrect background-image syntaxPellaeon Lin2016-05-211-1/+3
| * | Add visual cue when moving draggable item over droppable item,Pellaeon Lin2016-05-211-1/+1
* | | Allow setting debug as loglevel via occ log_manage (#24834)Joas Schilling2016-05-301-1/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-292-0/+6
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-282-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-278-0/+36
* | | Update license headersLukas Reschke2016-05-2636-38/+43
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-268-2/+36
* | | 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