]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoHide update notification if notification center is enabled 2803/head
Morris Jobke [Wed, 21 Dec 2016 14:44:06 +0000 (15:44 +0100)]
Hide update notification if notification center is enabled

* then the notification center already contains this info

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2790 from nextcloud/update-integration-test-image
Morris Jobke [Tue, 20 Dec 2016 22:24:18 +0000 (23:24 +0100)]
Merge pull request #2790 from nextcloud/update-integration-test-image

Update integration test image

7 years agoMerge pull request #2273 from nextcloud/fix_invalid_calendar
Lukas Reschke [Tue, 20 Dec 2016 22:09:27 +0000 (23:09 +0100)]
Merge pull request #2273 from nextcloud/fix_invalid_calendar

Add DAV repair step to fix calendar data

7 years agoMerge pull request #2789 from nextcloud/add-smb-tests
Lukas Reschke [Tue, 20 Dec 2016 22:03:13 +0000 (23:03 +0100)]
Merge pull request #2789 from nextcloud/add-smb-tests

Add SMB tests execution and execute files_external tests

7 years agoRun coverage 2789/head
Lukas Reschke [Tue, 20 Dec 2016 21:10:09 +0000 (22:10 +0100)]
Run coverage

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd SMB tests and execute files_external tests
Lukas Reschke [Mon, 19 Dec 2016 20:40:08 +0000 (21:40 +0100)]
Add SMB tests and execute files_external tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate integration test image 2790/head
Lukas Reschke [Tue, 20 Dec 2016 20:56:16 +0000 (21:56 +0100)]
Update integration test image

Updates the composer dependencies so running the tests should now be faster again…

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2719 from nextcloud/behat-transferownership
Lukas Reschke [Tue, 20 Dec 2016 20:50:19 +0000 (21:50 +0100)]
Merge pull request #2719 from nextcloud/behat-transferownership

[downstream] Behat transferownership

7 years agoMerge pull request #2769 from nextcloud/improve_user_user_coverage
Morris Jobke [Tue, 20 Dec 2016 15:50:44 +0000 (16:50 +0100)]
Merge pull request #2769 from nextcloud/improve_user_user_coverage

Improve OC\User\User coverage

7 years agoMerge pull request #2765 from nextcloud/kill-repairlegacystorages
Christoph Wurst [Tue, 20 Dec 2016 14:43:27 +0000 (15:43 +0100)]
Merge pull request #2765 from nextcloud/kill-repairlegacystorages

[downstream] Remove obsolete RepairLegacyStorages repair step

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 20 Dec 2016 12:02:31 +0000 (12:02 +0000)]
[tx-robot] updated from transifex

7 years agoImprove OC\User\User coverage 2769/head
Roeland Jago Douma [Mon, 19 Dec 2016 20:24:36 +0000 (21:24 +0100)]
Improve OC\User\User coverage

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2774 from nextcloud/fix-2585
Lukas Reschke [Tue, 20 Dec 2016 10:03:54 +0000 (11:03 +0100)]
Merge pull request #2774 from nextcloud/fix-2585

remove frequent, unimportant log message

7 years agoremove frequent, unimportant log message 2774/head
Arthur Schiwon [Mon, 19 Dec 2016 22:35:56 +0000 (23:35 +0100)]
remove frequent, unimportant log message

Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #2764 from nextcloud/fix-groupshare-sharetimesort
Christoph Wurst [Mon, 19 Dec 2016 20:40:42 +0000 (21:40 +0100)]
Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort

[downstream] When grouping shares, sort by stime then id (#26777)

7 years agoMerge pull request #2762 from nextcloud/add-js-computerFileSize
Lukas Reschke [Mon, 19 Dec 2016 19:01:22 +0000 (20:01 +0100)]
Merge pull request #2762 from nextcloud/add-js-computerFileSize

[downstream] Add js computer file size

7 years agoUpdate autoloader files 2765/head
Lukas Reschke [Mon, 19 Dec 2016 18:46:18 +0000 (19:46 +0100)]
Update autoloader files

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRemove obsolete RepairLegacyStorages repair step
Vincent Petry [Tue, 6 Dec 2016 16:35:57 +0000 (17:35 +0100)]
Remove obsolete RepairLegacyStorages repair step

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix finding transferred folder in integration tests 2719/head
Vincent Petry [Mon, 14 Nov 2016 11:06:01 +0000 (12:06 +0100)]
Fix finding transferred folder in integration tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoWhen grouping shares, sort by stime then id (#26777) 2764/head
Vincent Petry [Tue, 6 Dec 2016 22:37:57 +0000 (23:37 +0100)]
When grouping shares, sort by stime then id (#26777)

If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoVerify input, add more unit tests 2762/head
Patrick Paysant [Wed, 7 Dec 2016 10:43:44 +0000 (11:43 +0100)]
Verify input, add more unit tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd test for unparseable string
Patrick Paysant [Wed, 7 Dec 2016 10:05:07 +0000 (11:05 +0100)]
Add test for unparseable string

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoImplements all comments from @PVince81
Patrick Paysant [Wed, 7 Dec 2016 10:03:15 +0000 (11:03 +0100)]
Implements all comments from @PVince81

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdding computerFileSize in OC.Util
Patrick Paysant [Wed, 7 Dec 2016 09:38:54 +0000 (10:38 +0100)]
Adding computerFileSize in OC.Util

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2757 from nextcloud/cron-5.6
Lukas Reschke [Mon, 19 Dec 2016 16:22:10 +0000 (17:22 +0100)]
Merge pull request #2757 from nextcloud/cron-5.6

Also check in cron for old php version

7 years agoMerge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the...
Lukas Reschke [Mon, 19 Dec 2016 14:38:45 +0000 (15:38 +0100)]
Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the-space

Use a form so firefox doesn't try to save the space as a password

7 years agoAlso check in cron for old php version 2757/head
Roeland Jago Douma [Mon, 19 Dec 2016 14:29:52 +0000 (15:29 +0100)]
Also check in cron for old php version

Fixes #2756

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2754 from nextcloud/activities-manager-publish-exception
Robin Appelman [Mon, 19 Dec 2016 14:00:17 +0000 (15:00 +0100)]
Merge pull request #2754 from nextcloud/activities-manager-publish-exception

Activities IManager throws an BadMethodCallException

7 years agoMerge pull request #2689 from andreas-p/fix-remote-conflict
Lukas Reschke [Mon, 19 Dec 2016 13:34:56 +0000 (14:34 +0100)]
Merge pull request #2689 from andreas-p/fix-remote-conflict

Fix showConflict

7 years agoActivities IManager throws an BadMethodCallException 2754/head
Christoph Wurst [Mon, 19 Dec 2016 13:15:19 +0000 (14:15 +0100)]
Activities IManager throws an BadMethodCallException

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoAdjust to Nextcloud changes
Lukas Reschke [Fri, 16 Dec 2016 16:29:27 +0000 (17:29 +0100)]
Adjust to Nextcloud changes

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd transfer ownership integration tests (#26543)
Vincent Petry [Mon, 7 Nov 2016 21:52:07 +0000 (22:52 +0100)]
Add transfer ownership integration tests (#26543)

* Add transfer ownership integration tests

* Added more transfer ownership tests and OCC checks

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUse a form so firefox doesn't try to save the space as a password 2752/head
Joas Schilling [Mon, 19 Dec 2016 11:43:31 +0000 (12:43 +0100)]
Use a form so firefox doesn't try to save the space as a password

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2727 from nextcloud/fix-colon-issue
Roeland Jago Douma [Mon, 19 Dec 2016 09:19:15 +0000 (10:19 +0100)]
Merge pull request #2727 from nextcloud/fix-colon-issue

[downstream] Fix colon issue

7 years agoMerge pull request #2721 from nextcloud/ocs-die-on-exception
Roeland Jago Douma [Mon, 19 Dec 2016 07:38:02 +0000 (08:38 +0100)]
Merge pull request #2721 from nextcloud/ocs-die-on-exception

[downstream] Die in OCS v1.php on exception

7 years agoMerge pull request #2723 from nextcloud/integrity-exit-code
Roeland Jago Douma [Mon, 19 Dec 2016 07:37:43 +0000 (08:37 +0100)]
Merge pull request #2723 from nextcloud/integrity-exit-code

[downstream] Return 1 if integrity check is failed. Fixes #22806

7 years agoFix showConflict 2689/head
pflug [Thu, 15 Dec 2016 09:19:55 +0000 (10:19 +0100)]
Fix showConflict

use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
7 years agoMerge pull request #2726 from nextcloud/check-all-channels
Christoph Wurst [Sun, 18 Dec 2016 22:12:57 +0000 (23:12 +0100)]
Merge pull request #2726 from nextcloud/check-all-channels

[downstream] Consider all channel except blank and git to be signed

7 years agoMerge pull request #2735 from nextcloud/fix-settingsmenu
Christoph Wurst [Sun, 18 Dec 2016 19:50:20 +0000 (20:50 +0100)]
Merge pull request #2735 from nextcloud/fix-settingsmenu

Adjust shadows and fix positioning in header menus

7 years agoAdjust shadows and fix positioning 2735/head
Julius Haertl [Sat, 17 Dec 2016 19:05:57 +0000 (20:05 +0100)]
Adjust shadows and fix positioning

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoUpdate third-party ref for new sabre/uri version 2727/head
Lukas Reschke [Fri, 16 Dec 2016 17:15:13 +0000 (18:15 +0100)]
Update third-party ref for new sabre/uri version

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2725 from nextcloud/memcached-connect-once
Roeland Jago Douma [Sat, 17 Dec 2016 18:31:31 +0000 (19:31 +0100)]
Merge pull request #2725 from nextcloud/memcached-connect-once

[downstream] Set options, then add servers

7 years agoMerge pull request #2722 from nextcloud/failed-to-create-share-fix
Roeland Jago Douma [Sat, 17 Dec 2016 18:28:54 +0000 (19:28 +0100)]
Merge pull request #2722 from nextcloud/failed-to-create-share-fix

[downstream] commit transaction after select query

7 years agoMerge pull request #2720 from nextcloud/fix-25692
Roeland Jago Douma [Sat, 17 Dec 2016 18:27:23 +0000 (19:27 +0100)]
Merge pull request #2720 from nextcloud/fix-25692

[downstream] Do not validate return code is set is successful

7 years agoAdd integration test for creating folder with colon
Vincent Petry [Tue, 6 Dec 2016 12:35:45 +0000 (13:35 +0100)]
Add integration test for creating folder with colon

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoConsider all channel except blank and git to be signed 2726/head
Victor Dubiniuk [Wed, 23 Nov 2016 20:59:15 +0000 (23:59 +0300)]
Consider all channel except blank and git to be signed

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoSet options, then add servers 2725/head
Victor Dubiniuk [Fri, 9 Dec 2016 19:46:41 +0000 (22:46 +0300)]
Set options, then add servers

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoReturn 1 if integrity check is failed. Fixes #22806 2723/head
Victor Dubiniuk [Thu, 1 Dec 2016 15:50:27 +0000 (18:50 +0300)]
Return 1 if integrity check is failed. Fixes #22806

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agocommit transaction after select query 2722/head
phisch [Wed, 23 Nov 2016 11:27:06 +0000 (12:27 +0100)]
commit transaction after select query

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoDie in OCS v1.php on exception 2721/head
Vincent Petry [Fri, 18 Nov 2016 09:29:51 +0000 (10:29 +0100)]
Die in OCS v1.php on exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoDo not validate return code is set is successful 2720/head
Victor Dubiniuk [Mon, 12 Dec 2016 13:51:27 +0000 (16:51 +0300)]
Do not validate return code is set is successful

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade
Lukas Reschke [Fri, 16 Dec 2016 16:14:53 +0000 (17:14 +0100)]
Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade

Clear appstore cache on version upgrade

7 years agoMerge pull request #2504 from nextcloud/downstream-ldap-15
Roeland Jago Douma [Fri, 16 Dec 2016 15:40:04 +0000 (16:40 +0100)]
Merge pull request #2504 from nextcloud/downstream-ldap-15

Downstream LDAP Range Support

7 years agoMerge pull request #2550 from nextcloud/smb-notify-rename
Lukas Reschke [Fri, 16 Dec 2016 15:11:39 +0000 (16:11 +0100)]
Merge pull request #2550 from nextcloud/smb-notify-rename

Fix order of parameters when getting notified of smb renames

7 years agoMerge pull request #2714 from amittel/patch-1
Lukas Reschke [Fri, 16 Dec 2016 14:52:06 +0000 (15:52 +0100)]
Merge pull request #2714 from amittel/patch-1

Changed anchor

7 years agoMerge pull request #1678 from nextcloud/smb-stat-root
Lukas Reschke [Fri, 16 Dec 2016 12:41:33 +0000 (13:41 +0100)]
Merge pull request #1678 from nextcloud/smb-stat-root

Fix mtimes for share root

7 years agoMerge pull request #2398 from nextcloud/fix-2368
Lukas Reschke [Fri, 16 Dec 2016 12:35:33 +0000 (13:35 +0100)]
Merge pull request #2398 from nextcloud/fix-2368

flicker-free permission change in share dialog

7 years agoMerge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
Lukas Reschke [Fri, 16 Dec 2016 12:20:27 +0000 (13:20 +0100)]
Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity

Remove leading slash from sharing activity

7 years agoMerge pull request #2715 from nextcloud/fix_dav_toto_tests
Roeland Jago Douma [Fri, 16 Dec 2016 11:42:11 +0000 (12:42 +0100)]
Merge pull request #2715 from nextcloud/fix_dav_toto_tests

Fix TodoTest

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 agoChanged anchor 2714/head
amittel [Fri, 16 Dec 2016 09:51:01 +0000 (10:51 +0100)]
Changed anchor

from `avatar` to `personal-settings`

fixes #2711

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 agoClear appstore cache on version upgrade 2707/head
Roeland Jago Douma [Thu, 15 Dec 2016 21:04:03 +0000 (22:04 +0100)]
Clear appstore cache on version upgrade

* Add version to cached json
* Compare version
* Updated calls
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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 agoRemove leading slash from sharing activity 2695/head
Joas Schilling [Thu, 15 Dec 2016 14:53:48 +0000 (15:53 +0100)]
Remove leading slash from sharing activity

Signed-off-by: Joas Schilling <coding@schilljs.com>
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>