aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix filelist and checkbox vertical alignJan-Christoph Borchardt2017-04-261-3/+2
* Merge pull request #4512 from nextcloud/fix-translations-2Morris Jobke2017-04-264-7/+19
|\
| * Fix email vs mailJoas Schilling2017-04-261-1/+1
| * Use correct plural form and add special strings for tomorrow and todayJoas Schilling2017-04-262-2/+14
| * Fix past tenseJoas Schilling2017-04-261-4/+4
* | Merge pull request #4430 from nextcloud/refactor-authRoeland Jago Douma2017-04-262-14/+10
|\ \
| * | Refactor auth methodsJörn Friedrich Dreyer2017-04-262-14/+10
* | | Merge pull request #4478 from nextcloud/improve_settings_helpJoas Schilling2017-04-2614-23/+30
|\ \ \
| * | | Move h2 and settings-hint togetherJan-Christoph Borchardt2017-04-251-0/+1
| * | | Wording fixesJan-Christoph Borchardt2017-04-257-11/+8
| * | | Small layout fixes to settings hintsJan-Christoph Borchardt2017-04-253-6/+6
| * | | change the headline as suggestedFrank Karlitschek2017-04-251-2/+1
| * | | one more hintFrank Karlitschek2017-04-251-0/+1
| * | | adding some documentation hints and some smaller cleanupFrank Karlitschek2017-04-2511-15/+24
| | |/ | |/|
* | | Merge pull request #4467 from nextcloud/lists-for-html-mailsRoeland Jago Douma2017-04-262-22/+138
|\ \ \
| * | | Allow meta info and iconsJoas Schilling2017-04-252-8/+32
| * | | Add lists to HTML emailsJoas Schilling2017-04-242-22/+114
* | | | Merge pull request #4061 from nextcloud/downstream-26407Roeland Jago Douma2017-04-263-40/+86
|\ \ \ \
| * | | | no ternaryJörn Friedrich Dreyer2017-03-251-2/+10
| * | | | fix constantJörn Friedrich Dreyer2017-03-251-1/+1
| * | | | Add Redis Cluster supportRobin McCorkell2017-03-253-40/+78
* | | | | Merge pull request #4500 from nextcloud/downstream-27118Morris Jobke2017-04-263-26/+20
|\ \ \ \ \
| * | | | | Restrict proppatch to the proper nodesVincent Petry2017-04-253-26/+20
| | |_|/ / | |/| | |
* | | | | Merge pull request #4416 from gvmura/avoid-duplicate-files-googleMorris Jobke2017-04-261-0/+13
|\ \ \ \ \
| * \ \ \ \ Merge branch 'avoid-duplicate-files-google' of https://github.com/gvmura/serv...root2017-04-210-0/+0
| |\ \ \ \ \
| | * | | | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| * | | | | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| |/ / / / /
* | | | | | Merge pull request #4449 from stweil/mimetypesMorris Jobke2017-04-263-0/+36
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add test code for new image mime typesStefan Weil2017-04-251-0/+21
| * | | | | Add repair steps for new image mime typesStefan Weil2017-04-251-0/+13
| * | | | | Add mimetypes for jp2 and webpStefan Weil2017-04-251-0/+2
* | | | | | Merge pull request #4486 from nextcloud/fix-js-unitMorris Jobke2017-04-251-2/+1
|\ \ \ \ \ \
| * | | | | | Remove DOMPurify from srcFilesLukas Reschke2017-04-251-2/+1
| |/ / / / /
* | | | | | Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwoMorris Jobke2017-04-256-13/+332
|\ \ \ \ \ \
| * | | | | | Fix usersInGroup retrievalArthur Schiwon2017-04-252-14/+39
| * | | | | | fix method name due to changes in masterArthur Schiwon2017-04-251-1/+1
| * | | | | | Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2Arthur Schiwon2017-04-256-8/+302
| |\ \ \ \ \ \
| | * | | | | | user_ldap: Add support for gidNumberXuanwo2017-04-256-8/+302
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-26174-622/+1044
* | | | | | | | Merge pull request #3233 from nextcloud/contactsmenuJan-Christoph Borchardt2017-04-2635-21/+2831
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-2617-5/+849
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-254-2/+72
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Audit log for enabling/disabling a userJoas Schilling2017-04-252-0/+18
| * | | | | | | | | Trigger change when a user is enabled/disabledJoas Schilling2017-04-252-2/+54
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4508 from nextcloud/fix/remove-js-debug-loggingMorris Jobke2017-04-251-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove js debug loggingChristoph Wurst2017-04-251-1/+0
* | | | | | | | | | Merge pull request #4479 from nextcloud/auth-flowMorris Jobke2017-04-2510-0/+770
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix auth flow background color and redirect view layoutJan-Christoph Borchardt2017-04-252-4/+11
| * | | | | | | | | | AppToken to 72 charsRoeland Jago Douma2017-04-252-3/+3
| * | | | | | | | | | Do not remove the state token to earlyRoeland Jago Douma2017-04-251-1/+3