]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMerge pull request #3684 from nextcloud/run-lang-update-only-once
Roeland Jago Douma [Fri, 3 Mar 2017 12:51:32 +0000 (13:51 +0100)]
Merge pull request #3684 from nextcloud/run-lang-update-only-once

Execute UpdateLanguageCode only once

7 years agoMerge pull request #3607 from nextcloud/api-to-resend-welcome-message
Roeland Jago Douma [Fri, 3 Mar 2017 12:50:30 +0000 (13:50 +0100)]
Merge pull request #3607 from nextcloud/api-to-resend-welcome-message

OCS API endpoint to resend welcome message

7 years agoMerge pull request #3678 from nextcloud/issue-3677-caldav-sharing-permission-problem
Roeland Jago Douma [Fri, 3 Mar 2017 12:48:33 +0000 (13:48 +0100)]
Merge pull request #3678 from nextcloud/issue-3677-caldav-sharing-permission-problem

CalDAV sharing permissions should not depend on the order

7 years agoFix DI 3684/head
Joas Schilling [Fri, 3 Mar 2017 11:20:02 +0000 (12:20 +0100)]
Fix DI

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3689 from nextcloud/cleanup-legacy-classes
Joas Schilling [Fri, 3 Mar 2017 11:04:27 +0000 (12:04 +0100)]
Merge pull request #3689 from nextcloud/cleanup-legacy-classes

Cleanup not used legacy classes

7 years agoMake the test useful
Joas Schilling [Fri, 3 Mar 2017 11:01:38 +0000 (12:01 +0100)]
Make the test useful

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3687 from nextcloud/proper-transfer-ownership-date
Joas Schilling [Fri, 3 Mar 2017 10:56:59 +0000 (11:56 +0100)]
Merge pull request #3687 from nextcloud/proper-transfer-ownership-date

Use a proper date format for transfer ownership

7 years agoMerge pull request #3686 from nextcloud/downstream-27282
Joas Schilling [Fri, 3 Mar 2017 10:55:53 +0000 (11:55 +0100)]
Merge pull request #3686 from nextcloud/downstream-27282

filelist only refreshed if directory changes

7 years agoMerge pull request #3682 from whitekiba/master
Roeland Jago Douma [Fri, 3 Mar 2017 08:23:42 +0000 (09:23 +0100)]
Merge pull request #3682 from whitekiba/master

Remove deprecated OC_User::isLoggedIn

7 years agoGet rid of static OCS::notFound() 3689/head
Morris Jobke [Fri, 3 Mar 2017 06:41:21 +0000 (00:41 -0600)]
Get rid of static OCS::notFound()

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoCleanup not used legacy classes
Morris Jobke [Fri, 3 Mar 2017 06:31:33 +0000 (00:31 -0600)]
Cleanup not used legacy classes

* Person was removed via #2170
* other lcasses/interfaces are not used at all

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUse a proper date format for transfer ownership 3687/head
Morris Jobke [Fri, 3 Mar 2017 04:34:50 +0000 (22:34 -0600)]
Use a proper date format for transfer ownership

* on Windows : is not allowed as filename and doesn't get synced then
* uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3681 from nextcloud/dav-nonexisting-owner
Morris Jobke [Fri, 3 Mar 2017 03:55:51 +0000 (21:55 -0600)]
Merge pull request #3681 from nextcloud/dav-nonexisting-owner

handle non existing owners when handling dav requests

7 years agoExecute UpdateLanguageCode only once
Morris Jobke [Thu, 2 Mar 2017 18:12:19 +0000 (12:12 -0600)]
Execute UpdateLanguageCode only once

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agofilelist only refreshed if directory changes 3686/head
noveens [Wed, 1 Mar 2017 11:57:48 +0000 (17:27 +0530)]
filelist only refreshed if directory changes

check introduced at another method

comment added to explain one check

comment added to explain one check

unit tests added

small fixes in unit tests

missing semicolon added

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 3 Mar 2017 01:07:45 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoRemove deprecated OC_User::isLoggedIn 3682/head
Sebastian Wessalowski [Thu, 2 Mar 2017 15:52:05 +0000 (16:52 +0100)]
Remove deprecated OC_User::isLoggedIn

Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Mar 2017 16:48:52 +0000 (16:48 +0000)]
[tx-robot] updated from transifex

7 years agohandle non existing owners when handling dav requests 3681/head
Robin Appelman [Thu, 2 Mar 2017 14:26:00 +0000 (15:26 +0100)]
handle non existing owners when handling dav requests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #1377 from nextcloud/improve-finish-l10n
Joas Schilling [Thu, 2 Mar 2017 11:44:10 +0000 (12:44 +0100)]
Merge pull request #1377 from nextcloud/improve-finish-l10n

Change language code from fi_FI to fi

7 years agoMake sure shares use read-write when available 3678/head
Joas Schilling [Thu, 2 Mar 2017 10:34:27 +0000 (11:34 +0100)]
Make sure shares use read-write when available

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't waste energy unless necessary
Joas Schilling [Thu, 2 Mar 2017 10:24:56 +0000 (11:24 +0100)]
Don't waste energy unless necessary

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd a unit test for the broken case
Joas Schilling [Thu, 2 Mar 2017 11:27:59 +0000 (12:27 +0100)]
Add a unit test for the broken case

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUnit test cleanup
Joas Schilling [Thu, 2 Mar 2017 10:45:07 +0000 (11:45 +0100)]
Unit test cleanup

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3676 from individual-it/trash_problem
Joas Schilling [Thu, 2 Mar 2017 08:47:52 +0000 (09:47 +0100)]
Merge pull request #3676 from individual-it/trash_problem

fix for #3201

7 years agoMerge pull request #3674 from nextcloud/transifex-for-theming
Joas Schilling [Thu, 2 Mar 2017 08:33:57 +0000 (09:33 +0100)]
Merge pull request #3674 from nextcloud/transifex-for-theming

Transifex config for theming app

7 years agoFix table name and add a test for more than 1 entries 1377/head
Joas Schilling [Thu, 2 Mar 2017 08:11:47 +0000 (09:11 +0100)]
Fix table name and add a test for more than 1 entries

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agofix for #3201 3676/head
Artur Neumann [Thu, 2 Mar 2017 07:31:28 +0000 (13:16 +0545)]
fix for #3201

7 years agoRevert "fix mouse pointer"
Artur Neumann [Thu, 2 Mar 2017 07:10:16 +0000 (12:55 +0545)]
Revert "fix mouse pointer"

This reverts commit a4e2dc3033e40b58e5e72e2bda85a327ff092464.

7 years agoChange language code for languages with only one translation
Morris Jobke [Mon, 12 Sep 2016 16:15:22 +0000 (18:15 +0200)]
Change language code for languages with only one translation

* then the language is not that specific and get also matched for fi
* fallback from fi_FI to fi is supported - the other way around not
* contains repair script
* contains tests for repair script
* fixes #869

Order results to make postgres happy

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoTransifex config for theming app 3674/head
Morris Jobke [Thu, 2 Mar 2017 04:05:25 +0000 (22:05 -0600)]
Transifex config for theming app

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3666 from nextcloud/fix-return-type
Morris Jobke [Thu, 2 Mar 2017 01:38:40 +0000 (19:38 -0600)]
Merge pull request #3666 from nextcloud/fix-return-type

Fix return type of share provider

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Mar 2017 01:07:31 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3370 from Flole998/Flole998-patch-1
Morris Jobke [Wed, 1 Mar 2017 19:07:06 +0000 (13:07 -0600)]
Merge pull request #3370 from Flole998/Flole998-patch-1

Fix for Win Clients sometimes not connecting

7 years agoFix return type of share provider 3666/head
Joas Schilling [Wed, 1 Mar 2017 12:45:04 +0000 (13:45 +0100)]
Fix return type of share provider

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 1 Mar 2017 01:07:42 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoFix injection of defaults 3607/head
Morris Jobke [Fri, 24 Feb 2017 19:09:09 +0000 (13:09 -0600)]
Fix injection of defaults

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoOCS API endpoint to resend welcome message
Morris Jobke [Fri, 24 Feb 2017 06:01:13 +0000 (00:01 -0600)]
OCS API endpoint to resend welcome message

* send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger
  the welcome message to be send
* fixes #3367

example curl statement:

  curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H  "OCS-APIRequest: true" -u admin:password -X POST

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uri
Roeland Jago Douma [Tue, 28 Feb 2017 21:03:38 +0000 (22:03 +0100)]
Merge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uri

Fix saving backup codes by using a correct data uri

7 years agoMerge pull request #3650 from nextcloud/bugfix/tokenprovider-asserted-method-name
Roeland Jago Douma [Tue, 28 Feb 2017 19:24:11 +0000 (20:24 +0100)]
Merge pull request #3650 from nextcloud/bugfix/tokenprovider-asserted-method-name

DefaultTokenProviderTest mocked/asserted the wrong method

7 years agoMerge pull request #3651 from nextcloud/refactor/provisioning-usercontroller-test
Morris Jobke [Tue, 28 Feb 2017 19:12:41 +0000 (13:12 -0600)]
Merge pull request #3651 from nextcloud/refactor/provisioning-usercontroller-test

Refactor provision api app's UserControllerTest

7 years agoMerge pull request #3643 from nextcloud/replace-deprecated-tipsy
Lukas Reschke [Tue, 28 Feb 2017 09:49:14 +0000 (10:49 +0100)]
Merge pull request #3643 from nextcloud/replace-deprecated-tipsy

Replace deprecated $.tipsy(...) by $.tooltip(...)

7 years agoRefactor provision api app's UserControllerTest 3651/head
Christoph Wurst [Tue, 28 Feb 2017 09:40:49 +0000 (10:40 +0100)]
Refactor provision api app's UserControllerTest

* Replace deprecated getMock with createMock
* Use createMock consistently
* Use php's ::class references

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoDefaultTokenProviderTest mocked/asserted the wrong method 3650/head
Christoph Wurst [Tue, 28 Feb 2017 09:26:19 +0000 (10:26 +0100)]
DefaultTokenProviderTest mocked/asserted the wrong method

It's 'getRemember' instead of 'getRememberMe', hence some warnings
were generated by phpunit.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoFix saving backup codes by using a correct data uri 3649/head
Christoph Wurst [Tue, 28 Feb 2017 09:20:30 +0000 (10:20 +0100)]
Fix saving backup codes by using a correct data uri

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #2997 from nextcloud/fix_2957
Morris Jobke [Tue, 28 Feb 2017 06:34:09 +0000 (00:34 -0600)]
Merge pull request #2997 from nextcloud/fix_2957

Allow groups with / in sabre

7 years agoMerge pull request #3635 from individual-it/fix_quota_validation
Morris Jobke [Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)]
Merge pull request #3635 from individual-it/fix_quota_validation

better quota validation

7 years agofix typo 3643/head
Morris Jobke [Tue, 28 Feb 2017 06:14:34 +0000 (00:14 -0600)]
fix typo

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agomake values with white spaces possible 3635/head
Artur Neumann [Tue, 28 Feb 2017 02:40:34 +0000 (08:25 +0545)]
make values with white spaces possible

a user might enter values with white spaces, and that should be possible
and valid

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agobetter quota validation
Artur Neumann [Mon, 27 Feb 2017 06:49:15 +0000 (12:34 +0545)]
better quota validation

this fixes #3634

1. fixed computerFileSize to be more picky about incorrect values
2. more tests for computerFileSize
3. use computerFileSize to validate user quota

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 28 Feb 2017 01:07:54 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoReplace deprecated $.tipsy(...) by $.tooltip(...)
Christoph Wurst [Mon, 27 Feb 2017 21:25:05 +0000 (22:25 +0100)]
Replace deprecated $.tipsy(...) by $.tooltip(...)

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoProperly handle groups with a / 2997/head
Roeland Jago Douma [Mon, 9 Jan 2017 20:20:55 +0000 (21:20 +0100)]
Properly handle groups with a /

If a group contains a slash the principal URI becomes
principals/groups/foo/bar. Now the URI is plit on '/' so this creates
issues ;)

Fixes #2957

* Add tests for groups with /

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3618 from nextcloud/fix-install-page-warning
Roeland Jago Douma [Mon, 27 Feb 2017 14:11:56 +0000 (15:11 +0100)]
Merge pull request #3618 from nextcloud/fix-install-page-warning

Remove not needed rule for .warning

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 27 Feb 2017 01:19:49 +0000 (01:19 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3623 from nextcloud/daita-patch-1
Morris Jobke [Sun, 26 Feb 2017 23:03:36 +0000 (17:03 -0600)]
Merge pull request #3623 from nextcloud/daita-patch-1

Fix condition

7 years agoFix condition 3623/head
Maxence Lange [Sat, 25 Feb 2017 19:09:33 +0000 (18:09 -0100)]
Fix condition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 26 Feb 2017 01:24:13 +0000 (01:24 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 25 Feb 2017 01:25:07 +0000 (01:25 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3489 from nextcloud/give-hint-about-opcache
Morris Jobke [Fri, 24 Feb 2017 19:10:47 +0000 (13:10 -0600)]
Merge pull request #3489 from nextcloud/give-hint-about-opcache

Show info in admin settings about PHP opcache if disabled

7 years agoRemove not needed rule for .warning 3618/head
Morris Jobke [Fri, 24 Feb 2017 17:04:48 +0000 (11:04 -0600)]
Remove not needed rule for .warning

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3588 from GreenArchon/issue_#3461
Lukas Reschke [Fri, 24 Feb 2017 16:25:21 +0000 (17:25 +0100)]
Merge pull request #3588 from GreenArchon/issue_#3461

Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs

7 years agoMerge pull request #3598 from nextcloud/issue-3583-shared-addressbooks-fail-on-legacy...
Roeland Jago Douma [Fri, 24 Feb 2017 15:36:39 +0000 (16:36 +0100)]
Merge pull request #3598 from nextcloud/issue-3583-shared-addressbooks-fail-on-legacy-endpoint

Use the correct principal for shared addressbooks

7 years agoMerge pull request #3612 from KB7777/patch-1
Roeland Jago Douma [Fri, 24 Feb 2017 15:33:42 +0000 (16:33 +0100)]
Merge pull request #3612 from KB7777/patch-1

Update Setup.php

7 years agoUpdate Setup.php 3612/head
KB7777 [Fri, 24 Feb 2017 11:13:26 +0000 (12:13 +0100)]
Update Setup.php

7 years agoMerge pull request #3287 from nextcloud/readd_appstoreenabled_switch
Joas Schilling [Fri, 24 Feb 2017 09:07:25 +0000 (10:07 +0100)]
Merge pull request #3287 from nextcloud/readd_appstoreenabled_switch

Add back appstoreenabled config switch

7 years agoMerge pull request #3603 from nextcloud/update-icon
Joas Schilling [Fri, 24 Feb 2017 08:58:05 +0000 (09:58 +0100)]
Merge pull request #3603 from nextcloud/update-icon

Bring back checkmark icon on successful update

7 years agoMerge pull request #3605 from nextcloud/single-user
Joas Schilling [Fri, 24 Feb 2017 07:52:26 +0000 (08:52 +0100)]
Merge pull request #3605 from nextcloud/single-user

Clean up single user mode

7 years agoFix unit tests and improve appstore logic 3287/head
Morris Jobke [Thu, 23 Feb 2017 20:56:28 +0000 (14:56 -0600)]
Fix unit tests and improve appstore logic

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd back appstoreenabled config switch
Steffen Lindner [Thu, 26 Jan 2017 18:02:45 +0000 (19:02 +0100)]
Add back appstoreenabled config switch

Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>
7 years agoBring back checkmark icon on successful update 3603/head
Morris Jobke [Thu, 23 Feb 2017 21:25:48 +0000 (15:25 -0600)]
Bring back checkmark icon on successful update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 24 Feb 2017 01:21:37 +0000 (01:21 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3589 from nextcloud/remove-unneeded-repair-step
Morris Jobke [Thu, 23 Feb 2017 21:57:21 +0000 (15:57 -0600)]
Merge pull request #3589 from nextcloud/remove-unneeded-repair-step

Remove unneeded repair steps

7 years agoMerge pull request #3576 from robert-scheck/timezone
Morris Jobke [Thu, 23 Feb 2017 21:36:50 +0000 (15:36 -0600)]
Merge pull request #3576 from robert-scheck/timezone

According to issue #3553, the default logtimezone is always UTC

7 years agoMerge pull request #2602 from nextcloud/resize-the-controls-after-the-sidebar-slided-in
Lukas Reschke [Thu, 23 Feb 2017 14:46:06 +0000 (15:46 +0100)]
Merge pull request #2602 from nextcloud/resize-the-controls-after-the-sidebar-slided-in

Increase debounce time to make sure controls are resized after the sidebar disappeared

7 years agoUse the correct principal for shared addressbooks 3598/head
Joas Schilling [Thu, 23 Feb 2017 13:16:00 +0000 (14:16 +0100)]
Use the correct principal for shared addressbooks

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3590 from individual-it/correct_text_when_disabling_app
Lukas Reschke [Thu, 23 Feb 2017 09:32:19 +0000 (10:32 +0100)]
Merge pull request #3590 from individual-it/correct_text_when_disabling_app

show correct text when disabling App

7 years agoMerge pull request #3575 from nextcloud/better-thumbnail-quality
Joas Schilling [Thu, 23 Feb 2017 08:54:32 +0000 (09:54 +0100)]
Merge pull request #3575 from nextcloud/better-thumbnail-quality

Use 90% JPEG quality for thumbnails and previews by default

7 years agoshow correct text when disabling App 3590/head
Artur Neumann [Thu, 23 Feb 2017 06:02:38 +0000 (11:47 +0545)]
show correct text when disabling App

during the process of disabling an App the button would show "Enabling
app …"
This is corrected by this patch

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agoShow info in admin settings about PHP opcache if disabled 3489/head
Morris Jobke [Wed, 15 Feb 2017 06:40:36 +0000 (00:40 -0600)]
Show info in admin settings about PHP opcache if disabled

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoClean up single user mode 3605/head
Morris Jobke [Thu, 23 Feb 2017 05:02:31 +0000 (23:02 -0600)]
Clean up single user mode

Single user mode basically disables WebDAV, OCS and cron execution. Since
we heavily rely on WebDAV and OCS also in the web UI it's basically useless.
An admin only sees a broken interface and can't even change any settings nor
sees any files. Also sharing is not possible.

As this is at least the case since Nextcloud 9 and we haven't received any
reports for this it seems that this feature is not used at all so I removed it.

The encryption commands now rely on the well tested maintenance mode.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agocleanup old and not needed repair steps to speed up the update 3589/head
Morris Jobke [Thu, 23 Feb 2017 04:20:56 +0000 (22:20 -0600)]
cleanup old and not needed repair steps to speed up the update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove unneeded UpdateCertificateStore.
Morris Jobke [Thu, 16 Feb 2017 23:38:03 +0000 (17:38 -0600)]
Remove unneeded UpdateCertificateStore.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 23 Feb 2017 01:18:48 +0000 (01:18 +0000)]
[tx-robot] updated from transifex

7 years agoRefactor files' CacheEntry object creation to call cacheEntryFromData() all the time... 3588/head
Frédéric Fortier [Thu, 23 Feb 2017 01:03:32 +0000 (20:03 -0500)]
Refactor files' CacheEntry object creation to call cacheEntryFromData() all the time thus allowing proper casts to be done

Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
7 years agoAccording to issue #3553, the default logtimezone is always UTC 3576/head
Robert Scheck [Wed, 22 Feb 2017 23:15:45 +0000 (00:15 +0100)]
According to issue #3553, the default logtimezone is always UTC

Signed-off-by: Robert Scheck <robert@fedoraproject.org>
7 years agoMerge pull request #3580 from nextcloud/password-reset-wording
Morris Jobke [Wed, 22 Feb 2017 22:32:36 +0000 (16:32 -0600)]
Merge pull request #3580 from nextcloud/password-reset-wording

detail wording: password reset instead of recovery

7 years agoMerge pull request #3567 from nextcloud/autocomplete-settings
Björn Schießle [Wed, 22 Feb 2017 15:30:21 +0000 (16:30 +0100)]
Merge pull request #3567 from nextcloud/autocomplete-settings

some sharing settings

7 years agofix typo 3567/head
Bjoern Schiessle [Wed, 22 Feb 2017 15:28:42 +0000 (16:28 +0100)]
fix typo

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agodetail wording: password reset instead of recovery 3580/head
Jan-Christoph Borchardt [Wed, 22 Feb 2017 14:17:45 +0000 (15:17 +0100)]
detail wording: password reset instead of recovery

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agouse (int) instead of intval for performance reasons
Bjoern Schiessle [Wed, 22 Feb 2017 14:14:36 +0000 (15:14 +0100)]
use (int) instead of intval for performance reasons

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoFix code quality a bit 3575/head
Joas Schilling [Wed, 22 Feb 2017 11:17:55 +0000 (12:17 +0100)]
Fix code quality a bit

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse 90% JPEG quality for thumbnails and previews by default
Joas Schilling [Wed, 22 Feb 2017 11:11:42 +0000 (12:11 +0100)]
Use 90% JPEG quality for thumbnails and previews by default

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3418 from nextcloud/add-groups-to-userinfo
Lukas Reschke [Wed, 22 Feb 2017 11:26:47 +0000 (12:26 +0100)]
Merge pull request #3418 from nextcloud/add-groups-to-userinfo

add groups to user info output

7 years agoMerge pull request #3573 from nextcloud/correctly-catch-the-exception-from-pathinfo
Lukas Reschke [Wed, 22 Feb 2017 11:15:50 +0000 (12:15 +0100)]
Merge pull request #3573 from nextcloud/correctly-catch-the-exception-from-pathinfo

Catch exception from path info

7 years agoCatch exception from path info 3573/head
Joas Schilling [Wed, 22 Feb 2017 10:01:40 +0000 (11:01 +0100)]
Catch exception from path info

We don't really care when the path info can not be gathered correctly.
we will simply not use SCSS then but the CSS fallback.

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3570 from nextcloud/fix-share-loading
John Molakvoæ [Wed, 22 Feb 2017 09:20:56 +0000 (10:20 +0100)]
Merge pull request #3570 from nextcloud/fix-share-loading

Fix position of share autocomplete loading icon

7 years agoMerge pull request #3413 from nextcloud/theming-appdata
Lukas Reschke [Wed, 22 Feb 2017 09:16:33 +0000 (10:16 +0100)]
Merge pull request #3413 from nextcloud/theming-appdata

Move theming images to AppData

7 years agoMerge pull request #3566 from nextcloud/setUpScenario1
Lukas Reschke [Wed, 22 Feb 2017 09:10:57 +0000 (10:10 +0100)]
Merge pull request #3566 from nextcloud/setUpScenario1

Use clearer name setUpScenario

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 22 Feb 2017 01:12:24 +0000 (01:12 +0000)]
[tx-robot] updated from transifex