aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* urldecode group principals in Cal- and CardDAV backendGeorg Ehrke2017-06-125-0/+20
* 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
* | | | | Merge pull request #5259 from nextcloud/disable-groups-on-personal-pageMorris Jobke2017-06-063-0/+8
|\ \ \ \ \
| * | | | | allow admin to disable groups on personal pageBjoern Schiessle2017-06-063-0/+8
| |/ / / /
* | | | | Merge pull request #5268 from nextcloud/allow-to-theme-emailsMorris Jobke2017-06-062-0/+17
|\ \ \ \ \
| * | | | | Allow to overwrite the email template againJoas Schilling2017-06-062-0/+17
| |/ / / /
* | | | | Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fieldsMorris Jobke2017-06-064-28/+110
|\ \ \ \ \
| * | | | | adjust the testJoas Schilling2017-06-061-0/+46
| * | | | | Also cover the settings endpointJoas Schilling2017-06-021-19/+31
| * | | | | Don't allow the user to set fields they can't seeJoas Schilling2017-06-022-9/+33
* | | | | | Merge pull request #5265 from nextcloud/follow-up-5166-bring-back-descriptionMorris Jobke2017-06-063-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update autoloaderMorris Jobke2017-06-062-0/+4
| * | | | | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
|/ / / / /
* | | | | Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-...Morris Jobke2017-06-054-85/+33
|\ \ \ \ \
| * | | | | Combine sessions and app passwords view into one single viewChristoph Wurst2017-05-304-85/+33
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-0634-50/+316
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-0556-56/+56
* | | | | | Merge pull request #4791 from nextcloud/permalink_copy_on_clickMorris Jobke2017-06-041-9/+30
|\ \ \ \ \ \