d07a661c94
Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email
...
[stable12] Prevent sending second WWW-Authenticate header
2017-06-14 14:24:01 +02:00
aab5dd7d7e
Localize contacts menu search input placeholder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-14 11:52:52 +02:00
50ee4fba11
Translate OAuth2 in stable12
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 11:50:58 +02:00
fbeb6659f8
Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption-stable12
...
[stable12] don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:28 +02:00
426a4c11d6
[tx-robot] updated from transifex
2017-06-14 00:08:49 +00:00
1d2c1cf579
Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar
...
[stable12] allow PropPatch requests to contact_birthdays
2017-06-13 18:11:54 -05:00
513401bdb6
Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071
2017-06-13 18:05:16 -05:00
d4eb5cfecb
Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars
...
[stable12] Fix username and avatar for external users
2017-06-13 17:56:39 -05:00
4fec6dbf87
Merge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-when-share-view-is-opened
...
[stable12] Fix tag label removed when share view is opened
2017-06-13 17:32:55 -05:00
9f265007fe
Merge pull request #5387 from nextcloud/backport-5367
...
[stable12] Fix unknown share token error message
2017-06-13 17:23:29 -05:00
9e402df41d
Merge pull request #5388 from nextcloud/stable12-5378
...
[stable12] no themed icon when dragging folder
2017-06-13 17:23:02 -05:00
db83fb7e76
Merge pull request #5389 from nextcloud/stable12-5305
...
[stable12] Add quota to the files view
2017-06-13 17:22:39 -05:00
b2cd3107b8
Merge pull request #5382 from nextcloud/global-scale-settings-stable12
...
[stable12] fix "add to your nextcloud" input field
2017-06-13 14:43:02 -05:00
cd9fb8cdf0
Merge pull request #5385 from nextcloud/stable12-revert-5259
...
[stable12] Revert "allow admin to disable groups on personal page"
2017-06-13 14:38:38 -05:00
28f6104bc8
Do not show icon for quota bar
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 12:28:23 -05:00
f6d0b92c59
Remove unused element
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:20 -05:00
ef184c0b21
Put the quota bar to the bottom
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 12:28:16 -05:00
3ca3edd994
Adjust the unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:13 -05:00
41f107fd37
Remove the colored corners
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:09 -05:00
c691b6d299
Add an event so apps can add hidden fields to the files page
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:03 -05:00
901eca84b0
Only set the active item when there is one (not the case for quota)
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:59 -05:00
b1ddc57e08
Content will come from the external app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:55 -05:00
27b2102d6c
Remove useless translation and make it better on unlimited
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:51 -05:00
fe8450fcc9
Style quota entry in files view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-13 12:27:47 -05:00
f1da30cc1e
Add quota to the files view
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:43 -05:00
a292a4b778
Fix #5349 , no themed icon when dragging folder
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-13 12:22:57 -05:00
49c71bdbcb
Fix unknown share token
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:53:52 +02:00
913758dc28
Prevent sending second WWW-Authenticate header
...
Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard.
Fixes https://github.com/nextcloud/server/issues/5088
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 18:52:30 +02:00
c4b65ab5e2
Revert "allow admin to disable groups on personal page"
...
This reverts commit 28e1a9da6c#5259
2017-06-13 11:17:48 -05:00
751bc180cc
fix 'add to your nextcloud' input field, this is not an email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:00 +02:00
c9bc521532
Extract toggle visibility of a SystemTagsInfoView to its own view
...
The SystemTagsInfoViewToggleView is a basic view that renders a label
that, when clicked, toggles the visibility of an associated
SystemTagsInfoView.
In order to keep the view parent agnostic its attachment and detachment
to/from the MainfFileInfoView is done in the FilesPlugin.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
5985ecb66d
Add visibility related methods
...
SystemTagsInfoView now provides public methods related to its visibility
in preparation to be used by external objects.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
365d7918b2
Fix toggle element being removed when MainFileInfoView is rendered again
...
The toggle element was added to the MainFileInfoView element when
SystemTagsInfoView was rendered. However, if the MainFileInfoView was
rendered again after that the toggle element was removed. Therefore,
instead of adding it when SystemTagsInfoView is rendered, the toggle
element has to be added when MainFileInfoView triggers its "post-render"
event.
Note, however, that when MainFileInfoView is rendered all the events are
removed from its child elements. As the toggle uses a "click" event
either the event has to be added back or the element has to be detached
before the MainFileInfoView is rendered.
Fixes #4944
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
2384703cf6
Trigger pre and post render events in MainFileInfoDetailsView
...
The post-render event makes possible to modify the
MainFileInfoDetailsView element once it has been rendered, which is
needed by OCA.SystemTags.FilesPlugin to add the "Tags" label to the file
details, while the pre-render event makes possible to detach added
elements if needed before the MainFileInfoDetailsView is rendered again,
as that removes the events from the child DOM elements even if they
belong to other views.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
706106408c
Make possible to know the registered detail views in a details view
...
In some cases, an app may need to act on a detail view registered by
another app or the core, for example, to add extra elements to the
element of the detail view.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
bd626a9faa
Extract duplicated code to a method
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
f822e3af4d
Add acceptance tests for showing the input field for tags
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
4c56414cab
Merge pull request #5365 from nextcloud/backport-5343
...
[stable12] filter missing groups in share provider
2017-06-13 08:04:59 -05:00
f6264ad6c4
Merge pull request #5303 from nextcloud/fix_5047-nc12
...
[stable12] use the email address configured in Nextcloud as sender instead of the users email address
2017-06-13 12:19:56 +02:00
86c749349e
filter missing groups in share provider
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-13 10:54:02 +02:00
bd444c4951
Merge pull request #5354 from nextcloud/backport-5315-stable12
...
[stable12] execute eval in global scope, addresses #5314
2017-06-13 10:41:36 +02:00
eb22d392d8
Merge pull request #5355 from nextcloud/stable12-5167
...
[stable12] l10n improvements from transifex
2017-06-13 10:20:26 +02:00
4d84249ab7
don't try to encrypt/decrypt the certificate bundle
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 10:07:55 +02:00
7db495a246
Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not-admin
...
[stable12] Use the language of the recipient not the actor
2017-06-12 22:31:08 -05:00
e0d8b17b20
[tx-robot] updated from transifex
2017-06-13 00:08:32 +00:00
a4cba7df69
Merge pull request #5272 from nextcloud/stable12-5271
...
[stable12] Also use IMailer interface to generate the email template
2017-06-12 17:51:07 -05:00
17bde8a79e
Merge pull request #5353 from nextcloud/stable12-5344
...
[stable12] Remove the char because it breaks the export from transifex
2017-06-12 17:50:41 -05:00
e7e0d1b8a1
Update setupchecks.js
...
Fixed typo and removed doclink symbol.
Reported at transifex
Update util.php
Another l10n improvement from transifex.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-12 17:18:20 -05:00
d02bcfda86
execute eval in global scope, addresses #5314
...
unsure whether this is properly supported everywhere, injection is not an
option for us
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-12 23:37:20 +02:00
86b4ebc457
Merge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12
...
[stable12] add missing parent::setUp that broke any other dav app test
2017-06-12 23:09:35 +02:00
Joas Schilling
Christoph Wurst
Lukas Reschke
Nextcloud bot
Morris Jobke
Michael Munger
Jan-Christoph Borchardt
Patrik Kernstock
Bjoern Schiessle
Daniel Calviño Sánchez
Robin Appelman
rakekniven
Arthur Schiwon