aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1093 from nextcloud/mail-fontstackRaghu Nayyar2016-08-281-1/+1
|\
| * use proper font stack for emailJan-Christoph Borchardt2016-08-261-1/+1
* | Merge pull request #1097 from nextcloud/2fa-cancel-login-stylingJan-Christoph Borchardt2016-08-271-2/+4
|\ \
| * | fix double semicolonJan-Christoph Borchardt2016-08-271-1/+1
| * | 2fa cancel login stylingChristoph Wurst2016-08-271-2/+4
* | | Merge pull request #1098 from nextcloud/2fa-challenge-stylingJan-Christoph Borchardt2016-08-273-32/+38
|\ \ \
| * | | list 2FA providers as buttonsChristoph Wurst2016-08-273-5/+8
| * | | use centered h2 for 2FA page headersChristoph Wurst2016-08-273-22/+26
| * | | fix 2fa challenge page wordingChristoph Wurst2016-08-272-3/+2
| * | | reorder 2fa challenge HTMLChristoph Wurst2016-08-271-7/+7
| |/ /
* | | Merge pull request #968 from Faldon/fixing_spinner_animationLukas Reschke2016-08-271-5/+28
|\ \ \
| * | | Fixing infinite spinner animationThomas Pulzer2016-08-191-5/+28
* | | | Merge pull request #1058 from nextcloud/avatarController_cleanupLukas Reschke2016-08-272-54/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove unused core wrappersRoeland Jago Douma2016-08-251-20/+0
| * | | AvatarController cleanupRoeland Jago Douma2016-08-252-34/+23
* | | | Merge pull request #1088 from nextcloud/core_tags_cleanupLukas Reschke2016-08-262-166/+0
|\ \ \ \
| * | | | Remove the core tag routes since they are brokenRoeland Jago Douma2016-08-262-166/+0
| | |_|/ | |/| |
* | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loopJoas Schilling2016-08-261-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | prevent infinite redirect loops if the there is no 2fa provider to passChristoph Wurst2016-08-241-4/+6
* | | | adjust js testsArthur Schiwon2016-08-251-4/+4
* | | | fix internal links in security & setup warnings, resolves #1048Arthur Schiwon2016-08-251-2/+3
| |/ / |/| |
* | | Add cachebuster to icons.cssLukas Reschke2016-08-241-71/+71
* | | Move the reset token to core appJoas Schilling2016-08-232-4/+4
* | | Remove "password reset token" after successful loginJoas Schilling2016-08-231-0/+3
|/ /
* | Merge pull request #956 from nextcloud/fix_952Lukas Reschke2016-08-231-2/+2
|\ \
| * | When using permalinks don't error out if file id can't be foundRoeland Jago Douma2016-08-191-2/+2
| |/
* | Merge pull request #1000 from nextcloud/mail_icon_shareRoeland Jago Douma2016-08-223-5/+5
|\ \
| * | Make e-mail icon visibleRoeland Jago Douma2016-08-213-5/+5
* | | Fix some jshint issues in core/js/share*Roeland Jago Douma2016-08-197-11/+19
|/ /
* | Remove uninterpreted PHPLukas Reschke2016-08-191-1/+1
* | Merge pull request #964 from nextcloud/master-aedae12db5ebfaf56bec91b736fb8a5...Lukas Reschke2016-08-191-1/+4
|\ \
| * | [master] In cases where the server dictates the link share expiration the dat...Thomas Müller2016-08-191-1/+4
* | | Merge pull request #959 from nextcloud/map_mobiMarius Blüm2016-08-191-0/+3
|\ \ \ | |/ / |/| |
| * | Update mimetypesRoeland Jago Douma2016-08-191-0/+3
* | | Merge pull request #865 from nextcloud/ocs_configMorris Jobke2016-08-192-0/+18
|\ \ \ | |/ / |/| |
| * | we are Nextcloud :)Roeland Jago Douma2016-08-181-1/+1
| * | Move /config over to Core OCSControllerRoeland Jago Douma2016-08-182-0/+18
* | | Kill ajax/share.phpRoeland Jago Douma2016-08-182-378/+0
| |/ |/|
* | Add cachebuster to apps.cssLukas Reschke2016-08-181-3/+3
* | Add cachebuster to styles.cssLukas Reschke2016-08-181-8/+8
* | Add cachebuster to right navigationLukas Reschke2016-08-181-2/+2
* | Add cache buster to left menu barLukas Reschke2016-08-181-2/+2
* | Add cache buster to logoLukas Reschke2016-08-181-2/+2
* | Revert "Fixing infinite spinning animation on user menu ctrl+click"Morris Jobke2016-08-181-25/+9
|/
* Merge pull request #778 from nextcloud/Faldon-user_menu_uiMorris Jobke2016-08-181-9/+25
|\
| * Removed debug code.Faldon2016-08-111-1/+0
| * Fixed user and main menu closing on right mouse button click.Thomas Pulzer2016-08-111-7/+8
| * Changed app and user menu delegates to mousedown events.Thomas Pulzer2016-08-091-4/+13
| * Added OS X meta key check for stopping spinning animation in app and user menu.Thomas Pulzer2016-08-091-2/+2
| * Fixed user menu to not show spinner on ctrl+click.Thomas Pulzer2016-08-091-3/+10