summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-0842-86/+2086
|
* Merge pull request #7042 from ↵Lukas Reschke2017-11-073-8/+115
|\ | | | | | | | | nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects ensure uid for calendar objects is unique
| * ensure uid for calendar objects is uniqueGeorg Ehrke2017-11-063-8/+115
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #6552 from nextcloud/notifications-add-highlight-definitionMorris Jobke2017-11-071-0/+25
|\ \ | | | | | | Notifications: Add highlight type definition
| * | Notifications: Add highlight type definitionJulius Härtl2017-10-031-0/+25
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #6988 from starypatyk/stable12-mount-cache-performanceMorris Jobke2017-11-071-1/+5
|\ \ \ | | | | | | | | Improve performance of UserMountCache with external storage folders
| * | | Improve performance of UserMountCache with external storage foldersDariusz Olszewski2017-11-011-1/+5
| | | |
* | | | Merge pull request #7073 from nextcloud/no-whitepage-of-deathRoeland Jago Douma2017-11-071-1/+23
|\ \ \ \ | | | | | | | | | | Show proper error page even if the config.php has syntax errors
| * | | | Show proper error page even if the config.php has syntax errorsMorris Jobke2017-11-061-1/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7075 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-11-079-26/+7
|\ \ \ \ \ | | | | | | | | | | | | Remove unused variables
| * | | | | Remove unused variablesMorris Jobke2017-11-069-26/+7
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7094 from nextcloud/theming-capabilities-elementRoeland Jago Douma2017-11-073-5/+8
|\ \ \ \ \ | | | | | | | | | | | | Theming: expose element color though capabilities API
| * | | | | Theming: expose element color though capabilities APIJulius Härtl2017-11-073-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #6926 from nextcloud/license-remove-invalid-mailMorris Jobke2017-11-0710-13/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove invalid mail addresses when updating the license header
| * | | | | Run updated license header updaterMorris Jobke2017-11-079-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Remove brackets for invalid mail addresses when updating the license headerJulius Härtl2017-11-071-0/+9
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #7059 from kyrofa/bugfix/5532/loading_indicatorMorris Jobke2017-11-071-0/+2
|\ \ \ \ \ | | | | | | | | | | | | core: hide spinner for initial install
| * | | | | core: hide spinner for initial installKyle Fazzari2017-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core/js/setup.js has logic to show the spinner upon form submission, but ever since v12 was released the spinner was never hidden in the first place. Modify core/css/guest.css to hide it, which allows core/js/setup.js to do its thing. Fix #5532 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | | | | | Merge pull request #7020 from Fiech/masterMorris Jobke2017-11-071-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extended list of sensitive configuration values (2)
| * \ \ \ \ \ Merge branch 'master' into masterJohannes S2017-10-3122-29/+260
| |\ \ \ \ \ \
| * | | | | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In accordance with the issuetemplate app issue: https://github.com/nextcloud/issuetemplate/issues/27 Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0770-2/+6284
| | | | | | | |
* | | | | | | | Merge pull request #7087 from nextcloud/change-email-of-georgMorris Jobke2017-11-06109-95/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change georgehrke's email
| * | | | | | | | Change @georgehrke's emailMorris Jobke2017-11-06109-95/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | Merge pull request #7066 from nextcloud/appmenu-fixMorris Jobke2017-11-061-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix header app menu
| * | | | | | | | Fix header app menuJohn Molakvoæ (skjnldsv)2017-11-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | Merge pull request #7083 from nextcloud/update-license-headersMorris Jobke2017-11-061081-801/+2968
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update license headers
| * | | | | | | | | Update license headersMorris Jobke2017-11-061081-801/+2968
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | Merge pull request #7076 from nextcloud/s3-valid-bucket-nameMorris Jobke2017-11-061-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Better error message for invalid bucket names
| * | | | | | | | | Better error message for invalid bucket namesMorris Jobke2017-11-061-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-0640-176/+2875
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Implement plugins infrastructure in User_LDAP
| * | | | | | | | | User_LDAP plugins: smaller fixesVinicius Cubas Brand2017-11-0314-63/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * | | | | | | | | Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-0336-175/+2803
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | | | | | | | Merge pull request #7078 from nextcloud/jenkins-cleanupRoeland Jago Douma2017-11-061-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove Jenkins variables from autotest.sh
| * | | | | | | | | Remove Jenkins varibales from autotest.shMorris Jobke2017-11-061-4/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-066-48/+382
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Enhance calendar invitation emails
| * | | | | | | | | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | | | | | fancify invitation emailsGeorg Ehrke2017-11-032-45/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | | | | | Correctly use the email templatingJoas Schilling2017-11-031-80/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Language depending datesJoas Schilling2017-11-031-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Fix phpStorm complaintsJoas Schilling2017-11-033-52/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | DAV: Initial email customization supportLeon Klingele2017-11-033-16/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-Off-By: Leon Klingele <leon@struktur.de> Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | | | Merge pull request #7054 from nextcloud/timepicker-designJan-Christoph Borchardt2017-11-062-2/+72
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Improve timepicker design, align to datepicker
| * | | | | | | | | | Fix opacity of minutes in timepickerJan-Christoph Borchardt2017-11-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | | | | | Bg variable for menu arrowJohn Molakvoæ (skjnldsv)2017-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | | | Add vertical separator between hours and minutesJan-Christoph Borchardt2017-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | | | | | Improve timepicker design, align to datepickerJan-Christoph Borchardt2017-11-032-1/+68
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | | Merge pull request #7077 from nextcloud/jshint-improvementsMorris Jobke2017-11-069-15/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Reduce JSHint errors/warnings
| * | | | | | | | | | Reduce JSHint errors/warningsMorris Jobke2017-11-069-15/+15
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | Merge pull request #7074 from nextcloud/use-proper-whitespaceChristoph Wurst2017-11-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use proper whitespace