]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoForward port of #5190 to stable12 5422/head
Arthur Schiwon [Wed, 31 May 2017 10:15:06 +0000 (12:15 +0200)]
Forward port of #5190 to stable12

Treat PHP Errors on User session regenerate

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
remove unnecessary lines…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
change PHP errors to ErrorException in the session (PHP >=7)

Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_t...
Morris Jobke [Thu, 15 Jun 2017 04:11:18 +0000 (23:11 -0500)]
Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares

[stable12] allow users to send PropPatch request when calendar is group-shared with them

7 years agoMerge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_spec...
Morris Jobke [Thu, 15 Jun 2017 04:10:19 +0000 (23:10 -0500)]
Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue

[stable12] urldecode group principals in Cal- and CardDAV backend

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 15 Jun 2017 00:08:52 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5416 from nextcloud/stable12-5392
Morris Jobke [Wed, 14 Jun 2017 23:04:06 +0000 (18:04 -0500)]
Merge pull request #5416 from nextcloud/stable12-5392

[stable12] Use the guest.css for the maintenance page as well

7 years agoMerge pull request #5397 from nextcloud/stable12-5072
Morris Jobke [Wed, 14 Jun 2017 16:30:38 +0000 (11:30 -0500)]
Merge pull request #5397 from nextcloud/stable12-5072

[stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…

7 years agoMerge pull request #5026 from nextcloud/filename-input-tooltip-stable12
Morris Jobke [Wed, 14 Jun 2017 16:29:03 +0000 (11:29 -0500)]
Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12

[stable12] Make file name input tooltip error text change

7 years agoMerge pull request #5401 from nextcloud/translate-oauth2
Morris Jobke [Wed, 14 Jun 2017 16:22:56 +0000 (11:22 -0500)]
Merge pull request #5401 from nextcloud/translate-oauth2

Translate OAuth2 in stable12

7 years agoUse the guest.css for the maintenance page as well 5416/head
Morris Jobke [Tue, 13 Jun 2017 21:43:25 +0000 (16:43 -0500)]
Use the guest.css for the maintenance page as well

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder
Joas Schilling [Wed, 14 Jun 2017 12:45:15 +0000 (14:45 +0200)]
Merge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder

[stable12] Localize contacts menu search input placeholder

7 years agoMerge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via...
Joas Schilling [Wed, 14 Jun 2017 12:24:01 +0000 (14:24 +0200)]
Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email

[stable12] Prevent sending second WWW-Authenticate header

7 years agoLocalize contacts menu search input placeholder 5402/head
Christoph Wurst [Wed, 14 Jun 2017 08:29:36 +0000 (10:29 +0200)]
Localize contacts menu search input placeholder

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoTranslate OAuth2 in stable12 5401/head
Joas Schilling [Wed, 14 Jun 2017 09:50:58 +0000 (11:50 +0200)]
Translate OAuth2 in stable12

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption...
Lukas Reschke [Wed, 14 Jun 2017 07:50:28 +0000 (09:50 +0200)]
Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption-stable12

[stable12] don't try to encrypt/decrypt the certificate bundle

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 14 Jun 2017 00:08:49 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_bir...
Morris Jobke [Tue, 13 Jun 2017 23:11:54 +0000 (18:11 -0500)]
Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar

[stable12] allow PropPatch requests to contact_birthdays

7 years agoFixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromSt... 5397/head
Michael Munger [Tue, 23 May 2017 14:29:30 +0000 (10:29 -0400)]
Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071

7 years agoMerge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars
Morris Jobke [Tue, 13 Jun 2017 22:56:39 +0000 (17:56 -0500)]
Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars

[stable12] Fix username and avatar for external users

7 years agoMerge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-when...
Morris Jobke [Tue, 13 Jun 2017 22:32:55 +0000 (17:32 -0500)]
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

7 years agoMerge pull request #5387 from nextcloud/backport-5367
Morris Jobke [Tue, 13 Jun 2017 22:23:29 +0000 (17:23 -0500)]
Merge pull request #5387 from nextcloud/backport-5367

[stable12] Fix unknown share token error message

7 years agoMerge pull request #5388 from nextcloud/stable12-5378
Morris Jobke [Tue, 13 Jun 2017 22:23:02 +0000 (17:23 -0500)]
Merge pull request #5388 from nextcloud/stable12-5378

[stable12] no themed icon when dragging folder

7 years agoMerge pull request #5389 from nextcloud/stable12-5305
Morris Jobke [Tue, 13 Jun 2017 22:22:39 +0000 (17:22 -0500)]
Merge pull request #5389 from nextcloud/stable12-5305

[stable12] Add quota to the files view

7 years agoMerge pull request #5382 from nextcloud/global-scale-settings-stable12
Morris Jobke [Tue, 13 Jun 2017 19:43:02 +0000 (14:43 -0500)]
Merge pull request #5382 from nextcloud/global-scale-settings-stable12

[stable12] fix "add to your nextcloud" input field

7 years agoMerge pull request #5385 from nextcloud/stable12-revert-5259
Morris Jobke [Tue, 13 Jun 2017 19:38:38 +0000 (14:38 -0500)]
Merge pull request #5385 from nextcloud/stable12-revert-5259

[stable12] Revert "allow admin to disable groups on personal page"

7 years agoDo not show icon for quota bar 5389/head
Morris Jobke [Tue, 13 Jun 2017 15:28:49 +0000 (10:28 -0500)]
Do not show icon for quota bar

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove unused element
Joas Schilling [Tue, 13 Jun 2017 08:12:13 +0000 (10:12 +0200)]
Remove unused element

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoPut the quota bar to the bottom
Morris Jobke [Mon, 12 Jun 2017 22:03:54 +0000 (17:03 -0500)]
Put the quota bar to the bottom

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdjust the unit test
Joas Schilling [Mon, 12 Jun 2017 08:32:25 +0000 (10:32 +0200)]
Adjust the unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove the colored corners
Joas Schilling [Mon, 12 Jun 2017 08:25:09 +0000 (10:25 +0200)]
Remove the colored corners

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd an event so apps can add hidden fields to the files page
Joas Schilling [Mon, 12 Jun 2017 07:57:34 +0000 (09:57 +0200)]
Add an event so apps can add hidden fields to the files page

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoOnly set the active item when there is one (not the case for quota)
Joas Schilling [Fri, 9 Jun 2017 16:05:23 +0000 (18:05 +0200)]
Only set the active item when there is one (not the case for quota)

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoContent will come from the external app
Joas Schilling [Fri, 9 Jun 2017 16:05:10 +0000 (18:05 +0200)]
Content will come from the external app

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove useless translation and make it better on unlimited
Joas Schilling [Fri, 9 Jun 2017 15:24:10 +0000 (17:24 +0200)]
Remove useless translation and make it better on unlimited

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoStyle quota entry in files view
Jan-Christoph Borchardt [Fri, 9 Jun 2017 13:41:06 +0000 (15:41 +0200)]
Style quota entry in files view

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd quota to the files view
Joas Schilling [Thu, 8 Jun 2017 14:42:43 +0000 (16:42 +0200)]
Add quota to the files view

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix #5349, no themed icon when dragging folder 5388/head
Patrik Kernstock [Tue, 13 Jun 2017 15:11:05 +0000 (17:11 +0200)]
Fix #5349, no themed icon when dragging folder

Signed-off-by: Patrik Kernstock <info@pkern.at>
7 years agoFix unknown share token 5387/head
Joas Schilling [Tue, 13 Jun 2017 16:44:14 +0000 (18:44 +0200)]
Fix unknown share token

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoPrevent sending second WWW-Authenticate header 5386/head
Lukas Reschke [Tue, 13 Jun 2017 11:51:33 +0000 (13:51 +0200)]
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>
7 years agoRevert "allow admin to disable groups on personal page" 5385/head
Morris Jobke [Tue, 13 Jun 2017 15:43:21 +0000 (10:43 -0500)]
Revert "allow admin to disable groups on personal page"

This reverts commit 28e1a9da6cd3bce3cc843727d54094db4969dd7b.

See #5259

7 years agofix 'add to your nextcloud' input field, this is not an email address 5382/head
Bjoern Schiessle [Tue, 13 Jun 2017 15:31:44 +0000 (17:31 +0200)]
fix 'add to your nextcloud' input field, this is not an email address

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoExtract toggle visibility of a SystemTagsInfoView to its own view 5379/head
Daniel Calviño Sánchez [Fri, 9 Jun 2017 07:09:41 +0000 (09:09 +0200)]
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>
7 years agoAdd visibility related methods
Daniel Calviño Sánchez [Fri, 9 Jun 2017 01:34:56 +0000 (03:34 +0200)]
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>
7 years agoFix toggle element being removed when MainFileInfoView is rendered again
Daniel Calviño Sánchez [Fri, 9 Jun 2017 06:57:34 +0000 (08:57 +0200)]
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>
7 years agoTrigger pre and post render events in MainFileInfoDetailsView
Daniel Calviño Sánchez [Fri, 9 Jun 2017 05:55:27 +0000 (07:55 +0200)]
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>
7 years agoMake possible to know the registered detail views in a details view
Daniel Calviño Sánchez [Fri, 9 Jun 2017 01:14:23 +0000 (03:14 +0200)]
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>
7 years agoExtract duplicated code to a method
Daniel Calviño Sánchez [Fri, 9 Jun 2017 01:03:47 +0000 (03:03 +0200)]
Extract duplicated code to a method

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd acceptance tests for showing the input field for tags
Daniel Calviño Sánchez [Fri, 9 Jun 2017 01:02:33 +0000 (03:02 +0200)]
Add acceptance tests for showing the input field for tags

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoMerge pull request #5365 from nextcloud/backport-5343
Morris Jobke [Tue, 13 Jun 2017 13:04:59 +0000 (08:04 -0500)]
Merge pull request #5365 from nextcloud/backport-5343

[stable12] filter missing groups in share provider

7 years agoMerge pull request #5303 from nextcloud/fix_5047-nc12
Joas Schilling [Tue, 13 Jun 2017 10:19:56 +0000 (12:19 +0200)]
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

7 years agofilter missing groups in share provider 5365/head
Robin Appelman [Mon, 12 Jun 2017 13:46:19 +0000 (15:46 +0200)]
filter missing groups in share provider

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #5354 from nextcloud/backport-5315-stable12
Joas Schilling [Tue, 13 Jun 2017 08:41:36 +0000 (10:41 +0200)]
Merge pull request #5354 from nextcloud/backport-5315-stable12

[stable12] execute eval in global scope, addresses #5314

7 years agoMerge pull request #5355 from nextcloud/stable12-5167
Joas Schilling [Tue, 13 Jun 2017 08:20:26 +0000 (10:20 +0200)]
Merge pull request #5355 from nextcloud/stable12-5167

[stable12] l10n improvements from transifex

7 years agodon't try to encrypt/decrypt the certificate bundle 5362/head
Bjoern Schiessle [Tue, 13 Jun 2017 07:50:45 +0000 (09:50 +0200)]
don't try to encrypt/decrypt the certificate bundle

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not...
Morris Jobke [Tue, 13 Jun 2017 03:31:08 +0000 (22:31 -0500)]
Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not-admin

[stable12] Use the language of the recipient not the actor

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 13 Jun 2017 00:08:32 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5272 from nextcloud/stable12-5271
Morris Jobke [Mon, 12 Jun 2017 22:51:07 +0000 (17:51 -0500)]
Merge pull request #5272 from nextcloud/stable12-5271

[stable12] Also use IMailer interface to generate the email template

7 years agoMerge pull request #5353 from nextcloud/stable12-5344
Morris Jobke [Mon, 12 Jun 2017 22:50:41 +0000 (17:50 -0500)]
Merge pull request #5353 from nextcloud/stable12-5344

[stable12] Remove the char because it breaks the export from transifex

7 years agoUpdate setupchecks.js 5355/head
rakekniven [Tue, 30 May 2017 08:29:18 +0000 (10:29 +0200)]
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>
7 years agoexecute eval in global scope, addresses #5314 5354/head
Arthur Schiwon [Fri, 9 Jun 2017 11:43:09 +0000 (13:43 +0200)]
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>
7 years agoMerge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12
Lukas Reschke [Mon, 12 Jun 2017 21:09:35 +0000 (23:09 +0200)]
Merge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12

[stable12] add missing parent::setUp that broke any other dav app test

7 years agoRemove the char because it breaks the export from transifex 5353/head
Joas Schilling [Mon, 12 Jun 2017 14:30:08 +0000 (16:30 +0200)]
Remove the char because it breaks the export from transifex

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5324 from nextcloud/stable12-use-touch-icon-for-favicon-fb.png
Morris Jobke [Mon, 12 Jun 2017 20:28:42 +0000 (15:28 -0500)]
Merge pull request #5324 from nextcloud/stable12-use-touch-icon-for-favicon-fb.png

[stable12] Theme image for favicon-fb.png

7 years agoFix tests 5272/head
Lukas Reschke [Mon, 12 Jun 2017 20:19:44 +0000 (22:19 +0200)]
Fix tests

return is not defined

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #5320 from nextcloud/5122-stable12
Lukas Reschke [Mon, 12 Jun 2017 20:10:08 +0000 (22:10 +0200)]
Merge pull request #5320 from nextcloud/5122-stable12

[stable12] Fix ldap integration tests

7 years agourldecode group principals in Cal- and CardDAV backend 5299/head
Georg Ehrke [Thu, 8 Jun 2017 07:08:24 +0000 (09:08 +0200)]
urldecode group principals in Cal- and CardDAV backend

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd missing parent::setUp that broke any other dav app test 5352/head
Georg Ehrke [Thu, 8 Jun 2017 17:26:36 +0000 (19:26 +0200)]
add missing parent::setUp that broke any other dav app test

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 12 Jun 2017 00:08:21 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 11 Jun 2017 00:08:31 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 10 Jun 2017 00:08:47 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoTheme image for favicon-fb.png 5324/head
Lukas Reschke [Fri, 9 Jun 2017 19:12:37 +0000 (21:12 +0200)]
Theme image for favicon-fb.png

Fixes https://github.com/nextcloud/server/issues/5322

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoBackport of #5122 to stable12 5320/head
Arthur Schiwon [Fri, 26 May 2017 09:25:54 +0000 (11:25 +0200)]
Backport of #5122 to stable12

add missing INotificationManager when creating User backend, LDAP
UserManager

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Make IDE happy

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
add convenience script to run all tests at once

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #5123 from patschi/patch-2
Morris Jobke [Fri, 9 Jun 2017 01:07:25 +0000 (20:07 -0500)]
Merge pull request #5123 from patschi/patch-2

[stable12] Backported Fix #5059

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 9 Jun 2017 00:08:34 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5285 from nextcloud/personal-sessions-renamwe-12
Robin Appelman [Thu, 8 Jun 2017 10:09:14 +0000 (12:09 +0200)]
Merge pull request #5285 from nextcloud/personal-sessions-renamwe-12

[12] reword sessions to security in personal settings

7 years agouse the email address configured in Nextcloud as sender instead of the users email... 5303/head
Bjoern Schiessle [Thu, 8 Jun 2017 09:46:52 +0000 (11:46 +0200)]
use the email address configured in Nextcloud as sender instead of the users email address

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoallow users to send PropPatch request when calendar is group-shared with them 5301/head
Georg Ehrke [Thu, 8 Jun 2017 07:21:56 +0000 (09:21 +0200)]
allow users to send PropPatch request when calendar is group-shared with them

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoallow PropPatch requests to contact_birthdays 5296/head
Georg Ehrke [Thu, 8 Jun 2017 06:00:52 +0000 (08:00 +0200)]
allow PropPatch requests to contact_birthdays

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 8 Jun 2017 00:08:37 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #5291 from nextcloud/stable12-5287
Morris Jobke [Wed, 7 Jun 2017 21:27:50 +0000 (16:27 -0500)]
Merge pull request #5291 from nextcloud/stable12-5287

[stable12] show input fields if they are not empty but disable them in global scale mode

7 years agounify look of disabled display name / email address and the other input fields 5291/head
Bjoern Schiessle [Wed, 7 Jun 2017 16:03:47 +0000 (18:03 +0200)]
unify look of disabled display name / email address and the other input fields

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoshow input fields if they are not empty but disable them in global scale mode
Bjoern Schiessle [Wed, 7 Jun 2017 13:01:54 +0000 (15:01 +0200)]
show input fields if they are not empty but disable them in global scale mode

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #5278 from nextcloud/stable12-5277
Morris Jobke [Wed, 7 Jun 2017 16:42:21 +0000 (11:42 -0500)]
Merge pull request #5278 from nextcloud/stable12-5277

[stable12] Allow to change avatar when groups are disables

7 years agoAllow to change avatar when groups are disables 5278/head
Morris Jobke [Tue, 6 Jun 2017 22:06:44 +0000 (17:06 -0500)]
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>
7 years agoMerge pull request #5186 from nextcloud/backport-5126-email-change-spam
Morris Jobke [Wed, 7 Jun 2017 16:14:00 +0000 (11:14 -0500)]
Merge pull request #5186 from nextcloud/backport-5126-email-change-spam

[stable12] Don't trigger activity when the email didn't change

7 years agoreword sessions to security in personal settings 5285/head
Robin Appelman [Tue, 6 Jun 2017 12:16:53 +0000 (14:16 +0200)]
reword sessions to security in personal settings

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 7 Jun 2017 00:09:14 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

7 years agoAlso use IMailer interface to generate the email template
Morris Jobke [Tue, 6 Jun 2017 15:01:53 +0000 (10:01 -0500)]
Also use IMailer interface to generate the email template

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #5270 from nextcloud/stable12-5223
Björn Schießle [Tue, 6 Jun 2017 14:58:16 +0000 (16:58 +0200)]
Merge pull request #5270 from nextcloud/stable12-5223

[stable12] Don't allow the user to set fields they can't see

7 years agoMerge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12
Morris Jobke [Tue, 6 Jun 2017 13:53:55 +0000 (08:53 -0500)]
Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12

[stable12] allow admin to disable groups on personal page

7 years agoadjust the test 5270/head
Joas Schilling [Tue, 6 Jun 2017 09:42:48 +0000 (11:42 +0200)]
adjust the test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlso cover the settings endpoint
Joas Schilling [Fri, 2 Jun 2017 10:31:37 +0000 (12:31 +0200)]
Also cover the settings endpoint

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't allow the user to set fields they can't see
Joas Schilling [Fri, 2 Jun 2017 08:09:42 +0000 (10:09 +0200)]
Don't allow the user to set fields they can't see

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-sessions
Morris Jobke [Tue, 6 Jun 2017 13:03:04 +0000 (08:03 -0500)]
Merge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-sessions

[stable12] combine apptokens and sessions

7 years agoUpdate autoloader 5266/head
Morris Jobke [Tue, 6 Jun 2017 13:01:52 +0000 (08:01 -0500)]
Update autoloader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoBring back the description for app passwords
Joas Schilling [Tue, 6 Jun 2017 11:44:37 +0000 (13:44 +0200)]
Bring back the description for app passwords

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCombine sessions and app passwords view into one single view
Christoph Wurst [Tue, 30 May 2017 07:54:10 +0000 (09:54 +0200)]
Combine sessions and app passwords view into one single view

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoallow admin to disable groups on personal page 5261/head
Bjoern Schiessle [Tue, 6 Jun 2017 07:57:30 +0000 (09:57 +0200)]
allow admin to disable groups on personal page

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 6 Jun 2017 00:08:55 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex 5506/head
Nextcloud bot [Mon, 5 Jun 2017 00:08:38 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 4 Jun 2017 00:08:39 +0000 (00:08 +0000)]
[tx-robot] updated from transifex