summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Add acceptance tests for closing details view in Files appDaniel Calviño Sánchez2017-04-252-0/+213
| | |_|/ / | |/| | |
* | | | | Merge pull request #4529 from nextcloud/fix-filelist-checkboxesMorris Jobke2017-04-261-3/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix filelist and checkbox vertical alignJan-Christoph Borchardt2017-04-261-3/+2
* | | | | Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-264-7/+163
|\ \ \ \ \
| * | | | | Fix share indicator handlingVincent Petry2017-04-264-7/+163
| | |_|/ / | |/| | |
* | | | | Merge pull request #4374 from nextcloud/contactsmenu_popoverLukas Reschke2017-04-2617-8/+643
|\ \ \ \ \
| * | | | | handle 404 separatelyGeorg Ehrke2017-04-262-2/+24
| * | | | | unit test jquery.contactsmenuGeorg Ehrke2017-04-261-0/+198
| * | | | | fix CommentsTabsView js testGeorg Ehrke2017-04-261-1/+1
| * | | | | fix ContactsStoreTestGeorg Ehrke2017-04-261-5/+10
| * | | | | add contactsmenu popover to commentsGeorg Ehrke2017-04-262-2/+24
| * | | | | better detection whether or not contactsmenu target was clickedGeorg Ehrke2017-04-261-2/+2
| * | | | | add contactsmenu popover to resharer infoboxGeorg Ehrke2017-04-262-0/+9
| * | | | | Contactsmenu popover: show proper message when server throws errorGeorg Ehrke2017-04-261-2/+8
| * | | | | don't toggle sharing popover together with contactsmenu popoverGeorg Ehrke2017-04-261-2/+2
| * | | | | close menu again when clicking on avatarGeorg Ehrke2017-04-261-29/+26
| * | | | | add contactsmenu popoverGeorg Ehrke2017-04-2612-3/+379
* | | | | | Merge pull request #4503 from nextcloud/downstream-27281Roeland Jago Douma2017-04-261-0/+1
|\ \ \ \ \ \
| * | | | | | fix objectstore renameJoas Schilling2017-04-251-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4516 from nextcloud/downstream-27527Roeland Jago Douma2017-04-261-6/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix scanner after reviewVincent Petry2017-04-261-2/+3
| * | | | | OCC scanner commit in batchesVincent Petry2017-04-261-6/+38
| | |_|/ / | |/| | |
* | | | | 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