]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoFix TodoTest 2715/head
Roeland Jago Douma [Fri, 16 Dec 2016 10:50:50 +0000 (11:50 +0100)]
Fix TodoTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2625 from nextcloud/fix-todo-filter
Roeland Jago Douma [Fri, 16 Dec 2016 07:20:00 +0000 (08:20 +0100)]
Merge pull request #2625 from nextcloud/fix-todo-filter

Fix the Todos filter

7 years agoMerge pull request #2681 from nextcloud/changes-to-changelog
Roeland Jago Douma [Fri, 16 Dec 2016 07:14:29 +0000 (08:14 +0100)]
Merge pull request #2681 from nextcloud/changes-to-changelog

let's add a date :D

7 years agolet's add a date :D 2681/head
Jos Poortvliet [Wed, 14 Dec 2016 19:48:39 +0000 (20:48 +0100)]
let's add a date :D

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7
Lukas Reschke [Thu, 15 Dec 2016 17:31:54 +0000 (18:31 +0100)]
Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7

Don't disable apps on update if PHP >= 7.0.0

7 years agoDon't disable apps on update if PHP >= 7.0.0 2698/head
Lukas Reschke [Thu, 15 Dec 2016 15:08:04 +0000 (16:08 +0100)]
Don't disable apps on update if PHP >= 7.0.0

When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates.

This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2673 from nextcloud/shared-scanner-unmasked
Lukas Reschke [Thu, 15 Dec 2016 14:54:32 +0000 (15:54 +0100)]
Merge pull request #2673 from nextcloud/shared-scanner-unmasked

use unmasked permissions in shared scanner

7 years agoAdd integration tests for uploading files to a permission limited share 2673/head
Robin Appelman [Thu, 15 Dec 2016 13:31:40 +0000 (14:31 +0100)]
Add integration tests for uploading files to a permission limited share

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-before...
Roeland Jago Douma [Wed, 14 Dec 2016 18:50:16 +0000 (19:50 +0100)]
Merge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-before-creating-it

Do not connect to database before creating it

7 years agoMerge pull request #2674 from nextcloud/lookup-server-connector-12
Morris Jobke [Wed, 14 Dec 2016 18:31:27 +0000 (12:31 -0600)]
Merge pull request #2674 from nextcloud/lookup-server-connector-12

mark nc12 as supported for the lookup_server_connector

7 years agoMerge pull request #2665 from nextcloud/remove-db-class-and-interface
Roeland Jago Douma [Wed, 14 Dec 2016 18:05:41 +0000 (19:05 +0100)]
Merge pull request #2665 from nextcloud/remove-db-class-and-interface

Remove IDb interface which was deprecated for 3 years already

7 years agoMerge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-database-user...
Roeland Jago Douma [Wed, 14 Dec 2016 18:05:15 +0000 (19:05 +0100)]
Merge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-database-user-creation

Only log as info when we can not create a new DB user

7 years agomark nc12 as supporter 2674/head
Robin Appelman [Wed, 14 Dec 2016 15:09:53 +0000 (16:09 +0100)]
mark nc12 as supporter

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2677 from nextcloud/fix-avatars-in-mail
Roeland Jago Douma [Wed, 14 Dec 2016 17:55:52 +0000 (18:55 +0100)]
Merge pull request #2677 from nextcloud/fix-avatars-in-mail

Don't set Content-Disposition header if one already exists

7 years agoDon't set Content-Disposition header if one already exists 2677/head
Lukas Reschke [Wed, 14 Dec 2016 16:35:27 +0000 (17:35 +0100)]
Don't set Content-Disposition header if one already exists

If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

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

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agouse unmasked permissions in shared scanner
Robin Appelman [Wed, 14 Dec 2016 13:35:45 +0000 (14:35 +0100)]
use unmasked permissions in shared scanner

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressions
Joas Schilling [Wed, 14 Dec 2016 13:20:03 +0000 (14:20 +0100)]
Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressions

Safari CSPv3 support is sub-par

7 years agoOnly log as info when we can not create a new DB user 2671/head
Joas Schilling [Wed, 14 Dec 2016 13:06:14 +0000 (14:06 +0100)]
Only log as info when we can not create a new DB user

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDo not connect to database before creating it 2670/head
Joas Schilling [Wed, 14 Dec 2016 12:52:04 +0000 (13:52 +0100)]
Do not connect to database before creating it

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoSafari CSPv3 support is sub-par 2668/head
Lukas Reschke [Wed, 14 Dec 2016 12:17:20 +0000 (13:17 +0100)]
Safari CSPv3 support is sub-par

With 10.0.1 CSPv3 is broken in Safari if it doesn't run from a local IP. Awesome.

=> Let's remove this for Safari and keep chrome and Firefox in the whitelist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRemove IDb interface which was deprecated for 3 years already 2665/head
Joas Schilling [Wed, 14 Dec 2016 10:42:16 +0000 (11:42 +0100)]
Remove IDb interface which was deprecated for 3 years already

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2654 from nextcloud/increase-master-version
Roeland Jago Douma [Wed, 14 Dec 2016 10:20:58 +0000 (11:20 +0100)]
Merge pull request #2654 from nextcloud/increase-master-version

Update app versions and requirements

7 years agoUse the mocked config version 2654/head
Joas Schilling [Wed, 14 Dec 2016 09:45:27 +0000 (10:45 +0100)]
Use the mocked config version

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2659 from nextcloud/fix_2641
Roeland Jago Douma [Wed, 14 Dec 2016 09:36:05 +0000 (10:36 +0100)]
Merge pull request #2659 from nextcloud/fix_2641

Fix overwriting parameter

7 years agoFix overwriting parameter 2659/head
Roeland Jago Douma [Tue, 13 Dec 2016 21:28:09 +0000 (22:28 +0100)]
Fix overwriting parameter

Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoIncrease server version
Joas Schilling [Tue, 13 Dec 2016 19:44:00 +0000 (20:44 +0100)]
Increase server version

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUpdate app versions and requirements
Joas Schilling [Tue, 13 Dec 2016 19:41:55 +0000 (20:41 +0100)]
Update app versions and requirements

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2643 from nextcloud/apps-buttons-wording
Joas Schilling [Tue, 13 Dec 2016 14:49:39 +0000 (15:49 +0100)]
Merge pull request #2643 from nextcloud/apps-buttons-wording

fix wording for apps mgmt buttons

7 years agoMerge pull request #2636 from nextcloud/add-repair-step-to-fix-mounts v11.0.0
Lukas Reschke [Tue, 13 Dec 2016 13:19:56 +0000 (14:19 +0100)]
Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mounts

Add a repair step to fix broken mounts

7 years agoMerge pull request #2637 from nextcloud/mount-cache-storageid
Lukas Reschke [Tue, 13 Dec 2016 13:02:49 +0000 (14:02 +0100)]
Merge pull request #2637 from nextcloud/mount-cache-storageid

also compare storage ids when checking for changed mounts

7 years agoUpdate autoloading 2636/head
Joas Schilling [Tue, 13 Dec 2016 12:56:30 +0000 (13:56 +0100)]
Update autoloading

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd a unit test
Joas Schilling [Tue, 13 Dec 2016 12:53:51 +0000 (13:53 +0100)]
Add a unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd a repair step to fix broken mounts
Joas Schilling [Tue, 13 Dec 2016 11:09:31 +0000 (12:09 +0100)]
Add a repair step to fix broken mounts

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2642 from nextcloud/avatars_class_name
Lukas Reschke [Tue, 13 Dec 2016 12:22:50 +0000 (13:22 +0100)]
Merge pull request #2642 from nextcloud/avatars_class_name

Avatars class name

7 years agofix wording for apps mgmt buttons 2643/head
Jan-Christoph Borchardt [Tue, 13 Dec 2016 12:19:10 +0000 (13:19 +0100)]
fix wording for apps mgmt buttons

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #2639 from nextcloud/final-increase-of-version
Lukas Reschke [Tue, 13 Dec 2016 11:59:59 +0000 (12:59 +0100)]
Merge pull request #2639 from nextcloud/final-increase-of-version

Final version increasement for 11

7 years agoalways use numeric storage id in cacheentry 2637/head
Robin Appelman [Tue, 13 Dec 2016 11:53:38 +0000 (12:53 +0100)]
always use numeric storage id in cacheentry

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agofix cacheentry return wrong storage id
Robin Appelman [Tue, 13 Dec 2016 11:50:17 +0000 (12:50 +0100)]
fix cacheentry return wrong storage id

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoFixed correct filename of MoveAvatarsBackgroundJob 2642/head
Roeland Jago Douma [Tue, 13 Dec 2016 11:35:44 +0000 (12:35 +0100)]
Fixed correct filename of MoveAvatarsBackgroundJob

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2635 from nextcloud/fix_autoload_checker
Roeland Jago Douma [Tue, 13 Dec 2016 11:46:10 +0000 (12:46 +0100)]
Merge pull request #2635 from nextcloud/fix_autoload_checker

Fix autoload checker

7 years agoreuse cacheentry
Robin Appelman [Tue, 13 Dec 2016 11:30:29 +0000 (12:30 +0100)]
reuse cacheentry

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoFinal version increasement for 11 2639/head
Lukas Reschke [Tue, 13 Dec 2016 11:16:16 +0000 (12:16 +0100)]
Final version increasement for 11

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoalso compare storage ids when checking for changed mounts
Robin Appelman [Tue, 13 Dec 2016 11:10:44 +0000 (12:10 +0100)]
also compare storage ids when checking for changed mounts

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoUpdate autoloader 2635/head
Roeland Jago Douma [Tue, 13 Dec 2016 11:06:52 +0000 (12:06 +0100)]
Update autoloader

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoThe hash can change so checking for it is kind of dangerous
Roeland Jago Douma [Tue, 13 Dec 2016 11:06:20 +0000 (12:06 +0100)]
The hash can change so checking for it is kind of dangerous

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2615 from nextcloud/daita-sharecontroller
Lukas Reschke [Mon, 12 Dec 2016 17:28:06 +0000 (18:28 +0100)]
Merge pull request #2615 from nextcloud/daita-sharecontroller

Download a file in a subfolder in a sharedlink is not working

7 years agoupdate phpdoc 2615/head
Maxence Lange [Mon, 12 Dec 2016 17:15:13 +0000 (16:15 -0100)]
update phpdoc

Signed-off-by: Maxence Lange <maxence@pontapreta.net>
7 years agoMerge pull request #2629 from nextcloud/increase-v-1-again
Lukas Reschke [Mon, 12 Dec 2016 17:13:13 +0000 (18:13 +0100)]
Merge pull request #2629 from nextcloud/increase-v-1-again

Increase version once again

7 years agoIncrease version once again 2629/head
Lukas Reschke [Mon, 12 Dec 2016 17:03:49 +0000 (18:03 +0100)]
Increase version once again

For https://github.com/nextcloud/server/pull/2615

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2627 from nextcloud/already-increase-version
Lukas Reschke [Mon, 12 Dec 2016 15:40:40 +0000 (16:40 +0100)]
Merge pull request #2627 from nextcloud/already-increase-version

Increase version to 11.0.0

7 years agoMerge pull request #2620 from nextcloud/theming-externalfiles
Lukas Reschke [Mon, 12 Dec 2016 15:04:48 +0000 (16:04 +0100)]
Merge pull request #2620 from nextcloud/theming-externalfiles

Show theming icons on external storage folders

7 years agoIncrease version to 11.0.0 2627/head
Lukas Reschke [Mon, 12 Dec 2016 15:03:17 +0000 (16:03 +0100)]
Increase version to 11.0.0

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix the Todos filter 2625/head
Joas Schilling [Mon, 12 Dec 2016 14:26:28 +0000 (15:26 +0100)]
Fix the Todos filter

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2622 from nextcloud/improve-wording
Lukas Reschke [Mon, 12 Dec 2016 13:49:19 +0000 (14:49 +0100)]
Merge pull request #2622 from nextcloud/improve-wording

improve wording of admin settings to enable search on the public address book

7 years agoimprove wording of admin settings to enable search on the public address book 2622/head
Bjoern Schiessle [Mon, 12 Dec 2016 12:55:12 +0000 (13:55 +0100)]
improve wording of admin settings to enable search on the public address book

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoShow theming icons on external storage folders 2620/head
Julius Haertl [Fri, 9 Dec 2016 11:50:14 +0000 (12:50 +0100)]
Show theming icons on external storage folders

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 12 Dec 2016 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoDownload a file in a subfolder in a sharedlink is not working
Maxence Lange [Sun, 11 Dec 2016 19:32:28 +0000 (18:32 -0100)]
Download a file in a subfolder in a sharedlink is not working

the $node created using the path (GET) parameter is not used when executing fileListDownloaded()

7 years ago11.0 RC2 v11.0RC2
Lukas Reschke [Sun, 11 Dec 2016 15:34:27 +0000 (16:34 +0100)]
11.0 RC2

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 11 Dec 2016 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars
Lukas Reschke [Sat, 10 Dec 2016 11:22:15 +0000 (12:22 +0100)]
Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars

Do not add invites into read-only calendars

7 years agoMerge pull request #2598 from nextcloud/fix_2403
Lukas Reschke [Sat, 10 Dec 2016 11:21:20 +0000 (12:21 +0100)]
Merge pull request #2598 from nextcloud/fix_2403

Check for app updates on disabled page

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 10 Dec 2016 01:07:15 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2590 from nextcloud/postgres-install-failing
Roeland Jago Douma [Fri, 9 Dec 2016 21:46:03 +0000 (22:46 +0100)]
Merge pull request #2590 from nextcloud/postgres-install-failing

Revert "Quote database and role in queries"

7 years agoMerge pull request #2594 from nextcloud/dont-use-cached-info
Roeland Jago Douma [Fri, 9 Dec 2016 21:43:21 +0000 (22:43 +0100)]
Merge pull request #2594 from nextcloud/dont-use-cached-info

Don't use cached informations for app version when installing the app

7 years agoCheck for app updates on disabled page 2598/head
Roeland Jago Douma [Fri, 9 Dec 2016 21:03:58 +0000 (22:03 +0100)]
Check for app updates on disabled page

Fixes #2403

We need to check for updates of disabled apps so that if you update with
incompatible apps you at least get a chance to upgrade.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2596 from nextcloud/nc11-dev-manual-link
John Molakvoæ [Fri, 9 Dec 2016 19:24:08 +0000 (20:24 +0100)]
Merge pull request #2596 from nextcloud/nc11-dev-manual-link

Fix dev manual link for NC11

7 years agoFix dev manual link for NC11 2596/head
Christoph Wurst [Fri, 9 Dec 2016 18:32:16 +0000 (19:32 +0100)]
Fix dev manual link for NC11

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoDon't use cached informations for app version 2594/head
Lukas Reschke [Fri, 9 Dec 2016 16:46:05 +0000 (17:46 +0100)]
Don't use cached informations for app version

When installing an app from the appstore the `\OC_App::getAppVersion` code is triggered twice:

- First when the downloader tries to compare the current version to the new version on the appstore to check if there is a newer version. This protects against downgrade attacks and is implemented in `\OC\Installer::downloadApp`.
- Second, when the app is actually installed the current version is written to the database. (`\OC\Installer::installApp`)

This fails however when the version is actually cached. Because in step 1 the cached version will be set to "0" and then be reused in the second step.

While this is probably not the cleanest version I assume this is an approach that is least invasive. Feedback and suggestions welcome :)

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoLower the role name before using it 2590/head
Joas Schilling [Fri, 9 Dec 2016 15:41:01 +0000 (16:41 +0100)]
Lower the role name before using it

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2587 from nextcloud/theming-app-not-loaded
Morris Jobke [Fri, 9 Dec 2016 15:34:33 +0000 (16:34 +0100)]
Merge pull request #2587 from nextcloud/theming-app-not-loaded

Check if the theming app is loaded

7 years agoMerge pull request #2588 from nextcloud/theming-check-empty
Björn Schießle [Fri, 9 Dec 2016 14:57:44 +0000 (15:57 +0100)]
Merge pull request #2588 from nextcloud/theming-check-empty

Check if image files for theming are empty

7 years agoRevert "Quote database and role in queries"
Joas Schilling [Fri, 9 Dec 2016 14:36:14 +0000 (15:36 +0100)]
Revert "Quote database and role in queries"

This reverts commit 9ebd5d5bb20af9178e071c3c6f3b41d9a9bc8be0.

7 years agoMerge pull request #2584 from nextcloud/theming-filter-fix
Joas Schilling [Fri, 9 Dec 2016 13:53:34 +0000 (14:53 +0100)]
Merge pull request #2584 from nextcloud/theming-filter-fix

Add fallback to FILTER_LANCZOS for icon resizing

7 years agoMerge pull request #2582 from nextcloud/callback-alos-on-close
Lukas Reschke [Fri, 9 Dec 2016 12:44:53 +0000 (13:44 +0100)]
Merge pull request #2582 from nextcloud/callback-alos-on-close

Fire callback also on pure closing of prompt dialog

7 years agoCheck if image files for theming are empty 2588/head
Julius Haertl [Fri, 9 Dec 2016 11:44:01 +0000 (12:44 +0100)]
Check if image files for theming are empty

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFire callback also on pure closing of prompt dialog 2582/head
Morris Jobke [Fri, 9 Dec 2016 09:47:40 +0000 (10:47 +0100)]
Fire callback also on pure closing of prompt dialog

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoCheck if the theming app is loaded 2587/head
Julius Haertl [Fri, 9 Dec 2016 11:52:17 +0000 (12:52 +0100)]
Check if the theming app is loaded

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd fallback to FILTER_LANCZOS for icon resizing 2584/head
Julius Haertl [Fri, 9 Dec 2016 10:51:02 +0000 (11:51 +0100)]
Add fallback to FILTER_LANCZOS for icon resizing

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge pull request #2561 from nextcloud/save-timezone-on-login
blizzz [Fri, 9 Dec 2016 09:37:52 +0000 (10:37 +0100)]
Merge pull request #2561 from nextcloud/save-timezone-on-login

Save the timezone on login again

7 years agoOverwrite the schedule target calendar with the personal one and create it if missing 2274/head
Joas Schilling [Tue, 15 Nov 2016 16:01:40 +0000 (17:01 +0100)]
Overwrite the schedule target calendar with the personal one and create it if missing

Otherwise this leads to problems like events being added to the birthday calendar,
if that one is the first calendar which was created for the user. See:
https://github.com/nextcloud/server/pull/2274

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 9 Dec 2016 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2571 from nextcloud/issue-2568-allow-non-subadmins-to-change...
Morris Jobke [Thu, 8 Dec 2016 16:52:44 +0000 (17:52 +0100)]
Merge pull request #2571 from nextcloud/issue-2568-allow-non-subadmins-to-change-language

Allow non subadmins to change language

7 years agoAllow non-subadmins to change their language 2571/head
Joas Schilling [Thu, 8 Dec 2016 15:24:21 +0000 (16:24 +0100)]
Allow non-subadmins to change their language

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow to overwrite the message which we already do in SubadminMiddleware
Joas Schilling [Thu, 8 Dec 2016 15:23:49 +0000 (16:23 +0100)]
Allow to overwrite the message which we already do in SubadminMiddleware

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2565 from nextcloud/direct-desktop-clients
Roeland Jago Douma [Thu, 8 Dec 2016 13:33:08 +0000 (14:33 +0100)]
Merge pull request #2565 from nextcloud/direct-desktop-clients

Change URL for desktop clients directly to pop-up

7 years agoMerge pull request #2515 from nextcloud/tag-rename-styling
Joas Schilling [Thu, 8 Dec 2016 13:05:06 +0000 (14:05 +0100)]
Merge pull request #2515 from nextcloud/tag-rename-styling

fix styling of renaming system tags

7 years agoMerge pull request #2545 from nextcloud/fix-popover-width
Roeland Jago Douma [Thu, 8 Dec 2016 12:49:56 +0000 (13:49 +0100)]
Merge pull request #2545 from nextcloud/fix-popover-width

Fix popover width

7 years agoMerge pull request #2556 from Lartza/fix-setup-pgsql-quotes
Robin Appelman [Thu, 8 Dec 2016 12:45:17 +0000 (13:45 +0100)]
Merge pull request #2556 from Lartza/fix-setup-pgsql-quotes

Quote database and role in queries

7 years agoMerge pull request #2534 from nextcloud/fix-avatar-upload-buttons
Roeland Jago Douma [Thu, 8 Dec 2016 12:44:26 +0000 (13:44 +0100)]
Merge pull request #2534 from nextcloud/fix-avatar-upload-buttons

Fix avatar delete button

7 years agoCahnge URL for desktop clients directly to pop-up 2565/head
Felix A. Epp [Thu, 8 Dec 2016 11:40:52 +0000 (12:40 +0100)]
Cahnge URL for desktop clients directly to pop-up

by adding `/#install-clients` to the URL

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoSave the timezone on login again 2561/head
Joas Schilling [Thu, 8 Dec 2016 09:45:24 +0000 (10:45 +0100)]
Save the timezone on login again

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 8 Dec 2016 01:07:26 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoQuote database and role in queries 2556/head
Lari Tikkanen [Wed, 7 Dec 2016 20:12:25 +0000 (22:12 +0200)]
Quote database and role in queries

Fixes #1793
Signed-off-by: Lari Tikkanen <lartza@outlook.com>
7 years agoIncrease version string to 11,0,0,6
Lukas Reschke [Wed, 7 Dec 2016 14:29:45 +0000 (15:29 +0100)]
Increase version string to 11,0,0,6

7 years agoMerge pull request #2549 from nextcloud/increase-version-to-rc
Lukas Reschke [Wed, 7 Dec 2016 14:26:17 +0000 (15:26 +0100)]
Merge pull request #2549 from nextcloud/increase-version-to-rc

Increase versionto 11 RC1

7 years agoIncrease versionto 11 RC1 2549/head
Lukas Reschke [Wed, 7 Dec 2016 14:25:48 +0000 (15:25 +0100)]
Increase versionto 11 RC1

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix popover federationScopeMenu 2545/head
John Molakvoæ (skjnldsv) [Wed, 7 Dec 2016 10:29:55 +0000 (11:29 +0100)]
Fix popover federationScopeMenu

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoFix popover margin and width
John Molakvoæ (skjnldsv) [Wed, 7 Dec 2016 09:42:56 +0000 (10:42 +0100)]
Fix popover margin and width

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoMerge pull request #2542 from nextcloud/followup-2516-undefined-provider
Lukas Reschke [Wed, 7 Dec 2016 09:34:19 +0000 (10:34 +0100)]
Merge pull request #2542 from nextcloud/followup-2516-undefined-provider

Make sure $provider is defined when we use it