Commit Graph

39416 Commits

Author SHA1 Message Date
Morris Jobke 6a06df824e Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs
Version and dependency are now required
2017-06-12 22:33:16 -05:00
Nextcloud bot ea64cb0028
[tx-robot] updated from transifex 2017-06-13 00:08:22 +00:00
Morris Jobke aa243376ef Merge pull request #5271 from nextcloud/use-mailer-to-create-email-template
Also use IMailer interface to generate the email template
2017-06-12 17:52:52 -05:00
Morris Jobke 69b6504285 Merge pull request #5167 from nextcloud/rakekniven-patch-2
l10n improvements from transifex
2017-06-12 16:18:54 -05:00
Morris Jobke 6b3b341775 Merge pull request #5315 from nextcloud/global-eval
execute eval in global scope, addresses #5314
2017-06-12 15:52:55 -05:00
Morris Jobke 9c629eaf0e Merge pull request #5323 from nextcloud/use-touch-icon-for-favicon-fb.png
Theme image for favicon-fb.png
2017-06-12 15:28:00 -05:00
Lukas Reschke a4b48d55ad
Fix tests
return is not defined

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-12 22:19:44 +02:00
Lukas Reschke 7f0ed97522 Merge pull request #5310 from nextcloud/fix-tag-label-removed-when-share-view-is-opened
Fix tag label removed when share view is opened
2017-06-12 22:11:15 +02:00
Lukas Reschke 8b514bc4c1 Merge pull request #5341 from m4dz/bug/everyone-group-highlight
Highlight everyone group by default
2017-06-12 22:03:14 +02:00
Lukas Reschke 659a8bf24c Merge pull request #5344 from nextcloud/fix-transifex
Remove the char because it breaks the export from transifex
2017-06-12 22:00:07 +02:00
Morris Jobke 0577e55559 Merge pull request #5319 from nextcloud/theming-undo-hover
Show reset to default button for theming values on hover, fix #3198
2017-06-12 13:23:07 -05:00
Joas Schilling 8ecdeaa716
Remove the char because it breaks the export from transifex
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-12 16:30:08 +02:00
m4dz 56adbb4e1d [docs] remove useless TODO mark 2017-06-12 11:19:31 +02:00
m4dz 5feabd4634 [fix] Highlight 'everyone' group by default 2017-06-12 10:14:18 +02:00
Nextcloud bot 7297757a6a
[tx-robot] updated from transifex 2017-06-12 00:08:12 +00:00
Nextcloud bot 08702cbaba
[tx-robot] updated from transifex 2017-06-11 00:08:21 +00:00
Jan-Christoph Borchardt 6769d177c1 Merge pull request #5331 from nextcloud/remove-unneeded-css-apppasswords
Remove unneeded CSS
2017-06-11 00:51:49 +02:00
Marius Blüm bfbbc57025 Remove unneeded CSS
* was removed with #5166 so there is no more apppasswords-section

Signed-off-by: Marius Blüm <marius@lineone.io>
2017-06-10 21:50:25 +02:00
Nextcloud bot b2892274fc
[tx-robot] updated from transifex 2017-06-10 00:08:38 +00:00
Lukas Reschke ae6e1fe1df
Theme image for favicon-fb.png
Fixes https://github.com/nextcloud/server/issues/5322

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-09 21:12:37 +02:00
Jan-Christoph Borchardt 35eaae4209 Merge pull request #5307 from artemanufrij/master
Fix height for horizontal scrollbar
2017-06-09 16:39:55 +02:00
Lukas Reschke ee1b9d8762 Merge pull request #5122 from nextcloud/fix-ldap-integration-tests
Fix ldap integration tests
2017-06-09 16:05:36 +02:00
Morris Jobke 1286e9716b Merge pull request #5311 from nextcloud/revert-5116-zipstreamer
Revert "Always enable Zip64 extension for zipstreamer"
2017-06-09 08:56:20 -05:00
Jan-Christoph Borchardt 67069facb7 Show reset to default button for theming values on hover, fix #3198
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-09 15:54:17 +02:00
Lukas Reschke 602d82d5ee Merge pull request #5318 from nextcloud/fix-master
Fix missing js merge on master
2017-06-09 14:54:49 +02:00
Joas Schilling 42294612d7
Fix missing js merge on master
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-09 14:33:14 +02:00
Arthur Schiwon 944738c71d
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-09 13:43:09 +02:00
Lukas Reschke 0433c4e4cf Merge pull request #5118 from nextcloud/use-language-of-recipient-not-admin
Use the language of the recipient not the actor
2017-06-09 11:34:08 +02:00
Björn Schießle e99bcc496d Merge pull request #5308 from nextcloud/fix_running_only_dav_tests
add missing parent::setUp that broke any other dav app test
2017-06-09 10:46:31 +02:00
Joas Schilling 7d806bdfbd Revert "Always enable Zip64 extension for zipstreamer" 2017-06-09 10:21:26 +02:00
Daniel Calviño Sánchez 6bcace4609 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-09 09:13:29 +02:00
Daniel Calviño Sánchez ccf4b9ec69 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-09 09:04:24 +02:00
Daniel Calviño Sánchez 9e767b46ec 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-09 09:02:14 +02:00
Daniel Calviño Sánchez 599274f509 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-09 08:43:53 +02:00
Daniel Calviño Sánchez 0a3d9f25c1 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-09 03:14:23 +02:00
Daniel Calviño Sánchez 423136d319 Extract duplicated code to a method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-09 03:03:47 +02:00
Daniel Calviño Sánchez be02b3df28 Add acceptance tests for showing the input field for tags
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-09 03:02:33 +02:00
Nextcloud bot 628284a34c
[tx-robot] updated from transifex 2017-06-09 00:08:24 +00:00
Artem Anufrij cf83729873 Fix height for horizontal scrollbar
Signed-off-by: Artem Anufrij <artem.anufrij@live.de>
2017-06-08 19:27:32 +02:00
Georg Ehrke a0c2e6e922
add missing parent::setUp that broke any other dav app test
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 19:26:36 +02:00
Joas Schilling 3384c5fb70 Merge pull request #5287 from nextcloud/personal-page-gs-mode
show input fields if they are not empty but disable them in global scale mode
2017-06-08 15:03:58 +02:00
Nextcloud bot a74901fce1
[tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Morris Jobke a753fbe818 Merge pull request #5185 from nextcloud/error-spam-in-log
Don't try to generate logs for chunking paths
2017-06-07 17:12:47 -05:00
Morris Jobke e934e5104d Merge pull request #5277 from nextcloud/fix-personal-settings-regression
Allow to change avatar when groups are disables
2017-06-07 11:43:02 -05:00
Morris Jobke 3ad4a2839f Allow to change avatar when groups are disables
* password form overlaps upload button and doesn't allow to click it
* regression from #5259

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

make sure that we always clear all floating rules after the user settings parts

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:27:27 -05:00
Bjoern Schiessle 1ad4268046
unify look of disabled display name / email address and the other input fields
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 18:07:53 +02:00
Bjoern Schiessle f5731e1ba4
show input fields if they are not empty but disable them in global scale mode
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 17:13:29 +02:00
Joas Schilling 3678be045e Merge pull request #5267 from nextcloud/personal-sessions-renamwe
reword sessions to security in personal settings
2017-06-07 10:11:08 +02:00
Nextcloud bot a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Morris Jobke 72235064fb Merge pull request #5259 from nextcloud/disable-groups-on-personal-page
allow admin to disable groups on personal page
2017-06-06 11:30:08 -05:00