summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1187 from nextcloud/danysz-masterJoas Schilling2016-08-301-0/+3
|\
| * update to proper icons and run occ command to update JS fileMorris Jobke2016-08-301-0/+3
* | Merge pull request #1089 from nextcloud/allow-to-prevent-previewsRoeland Jago Douma2016-08-301-0/+2
|\ \ | |/ |/|
| * Check if the file isReadable() before sending a (cached) previewJoas Schilling2016-08-291-0/+2
* | Merge pull request #1172 from nextcloud/core_cleanupMorris Jobke2016-08-307-69/+41
|\ \
| * | AvatarController use proper JSONResponseRoeland Jago Douma2016-08-291-42/+33
| * | Minor cleanup in core ControllersRoeland Jago Douma2016-08-294-10/+5
| * | UserController does not require DefaultsRoeland Jago Douma2016-08-292-17/+3
* | | Merge pull request #1169 from nextcloud/2fa-single-providerLukas Reschke2016-08-291-4/+18
|\ \ \ | |/ / |/| |
| * | redirect to 2fa provider if there's only one active for the userChristoph Wurst2016-08-291-4/+18
* | | Merge pull request #1115 from nextcloud/fix_146Christoph Wurst2016-08-291-1/+1
|\ \ \ | |/ / |/| |
| * | Link 'Allow editing' => 'Allow upload and editing'Roeland Jago Douma2016-08-281-1/+1
| |/
* | Merge pull request #1136 from nextcloud/fix-16041Joas Schilling2016-08-291-0/+2
|\ \
| * | Modified overflow in multiselectorSergio BertolĂ­n2016-08-291-0/+2
| |/
* | Merge pull request #1135 from nextcloud/choose-buttonsJoas Schilling2016-08-291-0/+14
|\ \
| * | Choose button remains disabled unless files are chosenSujith Haridasan2016-08-291-0/+14
| |/
* | Merge pull request #1131 from nextcloud/add-paddingJoas Schilling2016-08-291-1/+2
|\ \
| * | Adds padding and max-width to the input for the sign up page. (#25959)Raghu Nayyar2016-08-291-1/+2
| |/
* / Users page lazy multiselect group dropdownsVincent Petry2016-08-291-23/+29
|/
* 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
|\ \