Commit graph

40908 commits

Author SHA1 Message Date
Joas Schilling
bea04d12d5 Merge pull request #6515 from nextcloud/templating-of-email-subjects
Allow templating of email subjects
2017-10-18 15:41:18 +02:00
Joas Schilling
cc798fd65f
Fix autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:16 +02:00
Joas Schilling
3119fd41ce
Set the data from the template
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling
c9af36a9ab
Introduce a public interface for Message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling
8b37fe7f65
Set the subject with the email template to allow theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling
f109c1a10c
Allow templating of email subjects
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:00 +02:00
Nextcloud bot
8e884ba52f
[tx-robot] updated from transifex 2017-10-18 00:08:23 +00:00
Roeland Jago Douma
cd0d27e46d Merge pull request #6854 from nextcloud/s3-multipart-propagate-exception
propagate multipart upload exception when aborting upload
2017-10-17 20:42:51 +02:00
Robin Appelman
91b3536f45
propagate multipart upload exception when aborting upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:10:58 +02:00
Bjoern Schiessle
e964f83f28
fix url
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-10-17 11:24:01 +02:00
Julius Härtl
be71ce32dc Merge pull request #5673 from tbille/gui-bug-authentication
Destroy modal when closed
2017-10-17 10:55:12 +02:00
Thomas Bille
75bc40f7a0 Destroy modal when closed
Signed-off-by: Thomas Bille <contact@tbille.fr>
2017-10-17 09:09:45 +01:00
Nextcloud bot
59c3ea91fd
[tx-robot] updated from transifex 2017-10-17 00:08:23 +00:00
Roeland Jago Douma
d34c7e89a0 Merge pull request #6844 from nextcloud/phan-repo
Phan is moved to a new repo
2017-10-16 19:23:03 +02:00
Roeland Jago Douma
17bd2fb268
Phan is moved to a new repo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-16 16:23:55 +02:00
blizzz
c25be8d83c Merge pull request #6837 from nextcloud/timespan-check-3
Fix future time spans
2017-10-16 13:35:53 +02:00
Nextcloud bot
84a7285f08
[tx-robot] updated from transifex 2017-10-16 00:08:26 +00:00
Roeland Jago Douma
1b2568e637 Merge pull request #6585 from nextcloud/theming-fileupload-errorhandling
Theming: Handle errors on uploaded files properly
2017-10-15 21:44:48 +02:00
Roeland Jago Douma
a5912cbe33 Merge pull request #6812 from nextcloud/upload-cache-path
also use configured 'cache_path' for new chunking
2017-10-15 21:42:41 +02:00
Roeland Jago Douma
a0823540b0 Merge pull request #6791 from nextcloud/fix-test-warnings
Fix test warnings
2017-10-15 21:40:43 +02:00
Roeland Jago Douma
3438020d66 Merge pull request #6813 from nextcloud/exclude-avatar-from-same-site-cookie
Exclude avatar from Same-Site Cookie requirement
2017-10-15 21:38:40 +02:00
dartcafe
ac2a6e0f2f
Fix future time spans
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-15 08:31:11 +02:00
John Molakvoæ
7a05cf300c Merge pull request #6761 from nextcloud/fix-avatar-loading-state
Fix popover position and avatar loading
2017-10-14 10:53:54 +02:00
John Molakvoæ (skjnldsv)
f33ed5fb13
Ellipsis
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-14 10:37:17 +02:00
John Molakvoæ (skjnldsv)
4ca88471b0
Fix popover position and avatar loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-14 10:37:17 +02:00
John Molakvoæ
0ce3636fba Merge pull request #6829 from nextcloud/fix-app-nav-edit-inputs
Fix app-navigation editable entry input colors
2017-10-14 07:07:02 +02:00
Nextcloud bot
d251623b01
[tx-robot] updated from transifex 2017-10-14 02:29:04 +00:00
Joas Schilling
4e0c078f48 Merge pull request #6826 from nextcloud/fix-class-name-in-exception-logger-plugin
Fix class name in exception logger plugin
2017-10-13 18:04:23 +02:00
John Molakvoæ (skjnldsv)
c68c538a86
Fix app-navigation editable entry input colors
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-13 16:21:38 +02:00
Joas Schilling
7c53f921a9
Use ::class to avoid errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 12:36:20 +02:00
Joas Schilling
fd5465d509
Fix class name, regression from 44cf67accd
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 12:35:52 +02:00
Joas Schilling
547f5afa5b Merge pull request #6816 from nextcloud/external-storage-confirm-delete-fix
Fix confirmation dialog when deleting external storage
2017-10-13 11:13:20 +02:00
Nextcloud bot
7c1ba6c00b
[tx-robot] updated from transifex 2017-10-13 00:08:27 +00:00
John Molakvoæ
fadd33040c Merge pull request #6818 from nextcloud/allow-div-on-nav-edit-entry-instead-of-form
Allow div instead of forms on editable nav entries
2017-10-12 20:01:51 +02:00
John Molakvoæ (skjnldsv)
cd4629b2ae
Allow div instead of forms on editable nav entries
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-12 19:16:47 +02:00
blizzz
af4810d5e5 Merge pull request #6795 from nextcloud/fix/contactsmenu-ie11
Fix contacts menu for IE11
2017-10-12 15:38:23 +02:00
Robin Appelman
a92596db78
Fix confirmation dialog when deleting external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-12 13:55:25 +02:00
John Molakvoæ
423be3df52 Merge pull request #6763 from nextcloud/fix-user-quota
Fix quota overflow and error color
2017-10-12 11:54:14 +02:00
John Molakvoæ (skjnldsv)
7f07ff48f2
Correct class to quota
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-12 11:07:07 +02:00
John Molakvoæ (skjnldsv)
ca00e24504
Fix quota overflow and error color
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-12 11:07:07 +02:00
Nextcloud bot
adb847de41
[tx-robot] updated from transifex 2017-10-12 00:08:28 +00:00
Robin Appelman
1a99e0dab4 Merge pull request #6602 from nextcloud/s3-multipart-upload
Add multipart upload for s3
2017-10-11 16:10:58 +02:00
Robin Appelman
e393b3553e
set s3 part size to 500mb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 15:59:53 +02:00
Lukas Reschke
8ad17a66d6
Exclude avatar from Same-Site Cookie requirement
Required to work with the upcoming Collabora avatar integration.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-10-11 14:41:34 +02:00
Robin Appelman
d27b0b07bc
also use configured 'cache_path' for new chunking
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:18:45 +02:00
Nextcloud bot
647b185c2b
[tx-robot] updated from transifex 2017-10-11 00:08:29 +00:00
Julius Härtl
0def38b50e Merge pull request #6739 from nextcloud/apps-management-updates
Add Updates section to app management
2017-10-10 14:57:35 +02:00
Julius Härtl
bee9ef83c6
App management: Do not show udpdate category if no updates are available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Julius Härtl
a3502c5c67
App management: Show proper message when no updates are available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Julius Härtl
6f7fb2e87b
App management: do not reset update counter to 0 on category change
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00