summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6515 from nextcloud/templating-of-email-subjectsJoas Schilling2017-10-1817-127/+204
|\ | | | | Allow templating of email subjects
| * Fix autoloadingJoas Schilling2017-10-182-0/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Set the data from the templateJoas Schilling2017-10-189-113/+46
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Introduce a public interface for MessageJoas Schilling2017-10-184-9/+106
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Set the subject with the email template to allow themingJoas Schilling2017-10-186-14/+21
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow templating of email subjectsJoas Schilling2017-10-182-0/+38
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-10-1828-8/+224
|
* Merge pull request #6854 from nextcloud/s3-multipart-propagate-exceptionRoeland Jago Douma2017-10-171-0/+1
|\ | | | | propagate multipart upload exception when aborting upload
| * propagate multipart upload exception when aborting uploadRobin Appelman2017-10-171-0/+1
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* fix urlBjoern Schiessle2017-10-172-4/+4
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #5673 from tbille/gui-bug-authenticationJulius Härtl2017-10-171-1/+3
|\ | | | | Destroy modal when closed
| * Destroy modal when closedThomas Bille2017-10-171-1/+3
|/ | | | Signed-off-by: Thomas Bille <contact@tbille.fr>
* [tx-robot] updated from transifexNextcloud bot2017-10-1722-32/+198
|
* Merge pull request #6844 from nextcloud/phan-repoRoeland Jago Douma2017-10-162-3/+3
|\ | | | | Phan is moved to a new repo
| * Phan is moved to a new repoRoeland Jago Douma2017-10-162-3/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6837 from nextcloud/timespan-check-3blizzz2017-10-161-12/+49
|\ \ | | | | | | Fix future time spans
| * | Fix future time spansdartcafe2017-10-151-12/+49
| |/ | | | | | | Signed-off-by: dartcafe <github@dartcafe.de>
* | [tx-robot] updated from transifexNextcloud bot2017-10-162-30/+42
| |
* | Merge pull request #6585 from nextcloud/theming-fileupload-errorhandlingRoeland Jago Douma2017-10-154-22/+222
|\ \ | | | | | | Theming: Handle errors on uploaded files properly
| * | Theming: Add tests for mimetype and upload error checksJulius Härtl2017-10-032-15/+170
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Theming: Fix message/loading display on errorsJulius Härtl2017-10-032-0/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Theming: Check valid image format also for logoJulius Härtl2017-10-031-0/+12
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Theming: Handle errors on uploaded files properlyJulius Härtl2017-10-032-17/+47
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #6812 from nextcloud/upload-cache-pathRoeland Jago Douma2017-10-151-1/+3
|\ \ \ | | | | | | | | also use configured 'cache_path' for new chunking
| * | | also use configured 'cache_path' for new chunkingRobin Appelman2017-10-111-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #6791 from nextcloud/fix-test-warningsRoeland Jago Douma2017-10-152-3/+3
|\ \ \ \ | | | | | | | | | | Fix test warnings
| * | | | Don't use deprecated $this->getMock() methodJoas Schilling2017-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix tests with group managerJoas Schilling2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6813 from nextcloud/exclude-avatar-from-same-site-cookieRoeland Jago Douma2017-10-151-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Exclude avatar from Same-Site Cookie requirement
| * | | | Exclude avatar from Same-Site Cookie requirementLukas Reschke2017-10-111-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Required to work with the upcoming Collabora avatar integration. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #6761 from nextcloud/fix-avatar-loading-stateJohn Molakvoæ2017-10-143-36/+51
|\ \ \ \ | | | | | | | | | | Fix popover position and avatar loading
| * | | | EllipsisJohn Molakvoæ (skjnldsv)2017-10-141-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix popover position and avatar loadingJohn Molakvoæ (skjnldsv)2017-10-143-36/+46
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #6829 from nextcloud/fix-app-nav-edit-inputsJohn Molakvoæ2017-10-141-1/+0
|\ \ \ \ | | | | | | | | | | Fix app-navigation editable entry input colors
| * | | | Fix app-navigation editable entry input colorsJohn Molakvoæ (skjnldsv)2017-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1426-38/+552
| | | | |
* | | | | Merge pull request #6826 from ↵Joas Schilling2017-10-131-6/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/fix-class-name-in-exception-logger-plugin Fix class name in exception logger plugin
| * | | | Use ::class to avoid errorsJoas Schilling2017-10-131-6/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix class name, regression from 44cf67accdc294f46bf82b3f8661f353dc5e22f0Joas Schilling2017-10-131-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #6816 from nextcloud/external-storage-confirm-delete-fixJoas Schilling2017-10-131-1/+1
|\ \ \ \ | | | | | | | | | | Fix confirmation dialog when deleting external storage
| * | | | Fix confirmation dialog when deleting external storageRobin Appelman2017-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1310-4/+194
| | | | |
* | | | | Merge pull request #6818 from ↵John Molakvoæ2017-10-121-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/allow-div-on-nav-edit-entry-instead-of-form Allow div instead of forms on editable nav entries
| * | | | | Allow div instead of forms on editable nav entriesJohn Molakvoæ (skjnldsv)2017-10-121-1/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #6795 from nextcloud/fix/contactsmenu-ie11blizzz2017-10-121-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Fix contacts menu for IE11
| * | | | | Fix contacts menu for IE11Christoph Wurst2017-10-091-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE11 triggers an 'input' event whenever an input is focussed or loses focus. Thus this causes an endless loading loop as soon as the view is re-rendered. To prevent this, this remembers the previous search term and ignores events where the term has not changed. Fixes https://github.com/nextcloud/server/issues/5281 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #6763 from nextcloud/fix-user-quotaJohn Molakvoæ2017-10-123-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix quota overflow and error color
| * | | | | | Correct class to quotaJohn Molakvoæ (skjnldsv)2017-10-122-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix quota overflow and error colorJohn Molakvoæ (skjnldsv)2017-10-121-3/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | / / / / [tx-robot] updated from transifexNextcloud bot2017-10-1218-0/+68
| |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-02 17:29:42 +0000