summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add occ command to expire the trashbin (#25878)Thomas Müller2016-08-294-0/+263
* Merge pull request #976 from nextcloud/downstream-25702Lukas Reschke2016-08-284-8/+19
|\
| * Hide the LDAP password in the client sideJuan Pablo Villafáñez2016-08-194-8/+19
* | Merge pull request #847 from nextcloud/quota-mount-in-homefolderLukas Reschke2016-08-281-1/+1
|\ \
| * | fix quota calculation when a filesystem is mounted in a user homeRobin Appelman2016-08-121-1/+1
* | | 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 #1105 from nextcloud/usermenu-orderingRaghu Nayyar2016-08-281-3/+3
|\ \ \ \
| * | | | fix ordering of user menu entriesJan-Christoph Borchardt2016-08-271-3/+3
* | | | | 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 #1103 from nextcloud/improve-theming-performanceJan-Christoph Borchardt2016-08-273-10/+107
|\ \ \ \ \ \
| * | | | | | Use temporary file as cacheLukas Reschke2016-08-272-4/+16
| * | | | | | Increase theming performanceLukas Reschke2016-08-273-7/+92
* | | | | | | 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 #1054 from nextcloud/less-cache-hitsLukas Reschke2016-08-275-18/+34
|\ \ \ \ \ \ \
| * | | | | | | optimize getUserFolder for the common caseRobin Appelman2016-08-251-11/+6
| * | | | | | | cache user foldersRobin Appelman2016-08-253-16/+28
| * | | | | | | cache root id in mountpointRobin Appelman2016-08-251-1/+5
| * | | | | | | reuse the userfolder's fileinfo when possible during dav setupRobin Appelman2016-08-251-1/+6
* | | | | | | | 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-273-116/+106
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove unused core wrappersRoeland Jago Douma2016-08-251-20/+0
| * | | | | | | AvatarController cleanupRoeland Jago Douma2016-08-253-96/+106
* | | | | | | | Merge pull request #1091 from nextcloud/theming-title-previewLukas Reschke2016-08-271-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Theming: Preview for page titleJulius Haertl2016-08-261-0/+3
* | | | | | | | Merge pull request #1088 from nextcloud/core_tags_cleanupLukas Reschke2016-08-264-168/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Autoloader updateRoeland Jago Douma2016-08-262-2/+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-269-15/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | prevent infinite redirect loops if the there is no 2fa provider to passChristoph Wurst2016-08-249-15/+71
* | | | | | | | | Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntaxRoeland Jago Douma2016-08-265-355/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reorder the buttons by importanceJoas Schilling2016-08-264-353/+8
| * | | | | | | | | Fix more HTML "syntax"Joas Schilling2016-08-261-1/+1
| * | | | | | | | | FIx the syntax of the buttonsJoas Schilling2016-08-261-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #771 from nextcloud/theming-fixesRoeland Jago Douma2016-08-265-17/+146
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make federadedfilesharing button match the theming valuesJulius Haertl2016-08-262-13/+23
| * | | | | | | | Theming: Adjust jquery ui elementsJulius Haertl2016-08-262-2/+46
| * | | | | | | | Theming: colorize primary buttonsJulius Haertl2016-08-262-2/+75
| * | | | | | | | Remove internal from getThemingDefaultsJulius Haertl2016-08-261-1/+0
| * | | | | | | | Theming: fix federated sharing button colorJulius Haertl2016-08-262-1/+4
* | | | | | | | | Merge pull request #1053 from nextcloud/set-quota-non-intLukas Reschke2016-08-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix setting quota to default or unlimitedRobin Appelman2016-08-251-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1077 from nextcloud/sharee_ocs_appframeworkLukas Reschke2016-08-263-93/+79
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |