summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Single block for PHP Mod not installedWilliam Bargent2016-06-101-3/+2
* Downstream 2016-06-09Arthur Schiwon2016-06-0913-19/+65
|\
| * Fix the FIXME (#25022)Joas Schilling2016-06-091-2/+1
| * Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-092-3/+3
| |\
| | * Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-072-3/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
| * | Merge pull request #25027 from owncloud/fix-22746-narrowtooltipVincent Petry2016-06-081-1/+1
| |\ \
| | * | Added width of the tooltipSergio Bertolín2016-06-081-1/+1
| | |/
| * | 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
| |/
* | Revert "Downstream 2016-06-08"blizzz2016-06-098-60/+15
* | Allow to cancel 2FA after loginJoas Schilling2016-06-095-1/+21
* | Fixed reviewsSergio Bertolín2016-06-091-2/+2
* | Allow to decrypt user '0' files onlyJoas Schilling2016-06-091-1/+2
* | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-092-12/+27
* | Comments fixeddavitol2016-06-091-3/+2
* | Fix Decrypt message via occdavitol2016-06-091-1/+11
* | THIS IS NEXTCLOUD! adjusting the designJan-Christoph Borchardt2016-06-0839-47/+50
|/
* [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