summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #5315 from nextcloud/global-evalMorris Jobke2017-06-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | execute eval in global scope, addresses #5314Arthur Schiwon2017-06-091-1/+1
* | | | | | | | Merge pull request #5323 from nextcloud/use-touch-icon-for-favicon-fb.pngMorris Jobke2017-06-121-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Theme image for favicon-fb.pngLukas Reschke2017-06-091-4/+8
* | | | | | | | | Merge pull request #5310 from nextcloud/fix-tag-label-removed-when-share-view...Lukas Reschke2017-06-1214-33/+487
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extract toggle visibility of a SystemTagsInfoView to its own viewDaniel Calviño Sánchez2017-06-096-26/+214
| * | | | | | | | | Add visibility related methodsDaniel Calviño Sánchez2017-06-092-6/+70
| * | | | | | | | | Fix toggle element being removed when MainFileInfoView is rendered againDaniel Calviño Sánchez2017-06-092-10/+26
| * | | | | | | | | Trigger pre and post render events in MainFileInfoDetailsViewDaniel Calviño Sánchez2017-06-091-0/+4
| * | | | | | | | | Make possible to know the registered detail views in a details viewDaniel Calviño Sánchez2017-06-094-0/+72
| * | | | | | | | | Extract duplicated code to a methodDaniel Calviño Sánchez2017-06-091-28/+15
| * | | | | | | | | Add acceptance tests for showing the input field for tagsDaniel Calviño Sánchez2017-06-092-0/+123
* | | | | | | | | | Merge pull request #5341 from m4dz/bug/everyone-group-highlightLukas Reschke2017-06-121-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [docs] remove useless TODO markm4dz2017-06-121-1/+0
| * | | | | | | | | | [fix] Highlight 'everyone' group by defaultm4dz2017-06-121-0/+3
* | | | | | | | | | | Merge pull request #5344 from nextcloud/fix-transifexLukas Reschke2017-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove the char because it breaks the export from transifexJoas Schilling2017-06-121-1/+1
* | | | | | | | | | | | Merge pull request #5319 from nextcloud/theming-undo-hoverMorris Jobke2017-06-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Show reset to default button for theming values on hover, fix #3198Jan-Christoph Borchardt2017-06-091-0/+2
* | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-128-8/+8
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1116-4/+18
* | | | | | | | | | | Merge pull request #5331 from nextcloud/remove-unneeded-css-apppasswordsJan-Christoph Borchardt2017-06-111-4/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unneeded CSSMarius Blüm2017-06-101-4/+0
|/ / / / / / / / / / /
* | | / / / / / / / / [tx-robot] updated from transifexNextcloud bot2017-06-1016-140/+150
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #5307 from artemanufrij/masterJan-Christoph Borchardt2017-06-091-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix height for horizontal scrollbarArtem Anufrij2017-06-081-0/+1
* | | | | | | | | | | Merge pull request #5122 from nextcloud/fix-ldap-integration-testsLukas Reschke2017-06-0913-23/+121
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add convenience script to run all tests at onceArthur Schiwon2017-05-261-0/+34
| * | | | | | | | | | | Make IDE happyArthur Schiwon2017-05-2610-18/+81
| * | | | | | | | | | | add missing INotificationManager when creating User backend, LDAPArthur Schiwon2017-05-263-5/+6
* | | | | | | | | | | | Merge pull request #5311 from nextcloud/revert-5116-zipstreamerMorris Jobke2017-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "Always enable Zip64 extension for zipstreamer"Joas Schilling2017-06-091-1/+1
* | | | | | | | | | | | Merge pull request #5318 from nextcloud/fix-masterLukas Reschke2017-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix missing js merge on masterJoas Schilling2017-06-091-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5118 from nextcloud/use-language-of-recipient-not-adminLukas Reschke2017-06-091-1/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use the language of the recipient not the actorJoas Schilling2017-05-261-1/+32
* | | | | | | | | | | | Merge pull request #5308 from nextcloud/fix_running_only_dav_testsBjörn Schießle2017-06-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | add missing parent::setUp that broke any other dav app testGeorg Ehrke2017-06-081-0/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-09114-2180/+262
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #5287 from nextcloud/personal-page-gs-modeJoas Schilling2017-06-082-16/+39
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | unify look of disabled display name / email address and the other input fieldsBjoern Schiessle2017-06-072-10/+11
| * | | | | | | | | show input fields if they are not empty but disable them in global scale modeBjoern Schiessle2017-06-071-7/+29
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-08110-162/+446
* | | | | | | | | Merge pull request #5185 from nextcloud/error-spam-in-logMorris Jobke2017-06-071-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't try to generate logs for chunking pathsJoas Schilling2017-05-311-0/+8
* | | | | | | | | | Merge pull request #5277 from nextcloud/fix-personal-settings-regressionMorris Jobke2017-06-072-3/+8
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow to change avatar when groups are disablesMorris Jobke2017-06-072-3/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5267 from nextcloud/personal-sessions-renamweJoas Schilling2017-06-074-22/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reword sessions to security in personal settingsRobin Appelman2017-06-064-22/+22
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-07188-712/+4512