]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoWe have to mock the is_uploaded_file in the OC\Core\Controller namespace 884/head
Roeland Jago Douma [Mon, 15 Aug 2016 18:08:20 +0000 (20:08 +0200)]
We have to mock the is_uploaded_file in the OC\Core\Controller namespace

8 years agoFix mock call in AvatarControllerTest
Roeland Jago Douma [Mon, 15 Aug 2016 18:07:07 +0000 (20:07 +0200)]
Fix mock call in AvatarControllerTest

8 years agoUse generated URL
Lukas Reschke [Mon, 15 Aug 2016 15:37:55 +0000 (17:37 +0200)]
Use generated URL

8 years agoFix CheckSetupController tests
Lukas Reschke [Mon, 15 Aug 2016 15:55:36 +0000 (17:55 +0200)]
Fix CheckSetupController tests

8 years agoFix tests for LoginController
Lukas Reschke [Mon, 15 Aug 2016 15:19:32 +0000 (17:19 +0200)]
Fix tests for LoginController

8 years agoFix template test
Lukas Reschke [Mon, 15 Aug 2016 15:19:50 +0000 (17:19 +0200)]
Fix template test

8 years agoAdd reference to current user
Lukas Reschke [Mon, 15 Aug 2016 15:15:14 +0000 (17:15 +0200)]
Add reference to current user

8 years agoUse proper casing
Lukas Reschke [Mon, 15 Aug 2016 15:00:35 +0000 (17:00 +0200)]
Use proper casing

8 years agoMerge pull request #875 from nextcloud/stable10_composer_files
Roeland Jago Douma [Mon, 15 Aug 2016 12:52:00 +0000 (14:52 +0200)]
Merge pull request #875 from nextcloud/stable10_composer_files

Recreate the composer autoloader files

8 years agoRecreate the composer autoloader files 875/head
Roeland Jago Douma [Mon, 15 Aug 2016 11:38:22 +0000 (13:38 +0200)]
Recreate the composer autoloader files

* Adds missing files (so they are statically loaded)

8 years agoMerge pull request #833 from nextcloud/stable10-backport-819
Lukas Reschke [Thu, 11 Aug 2016 09:24:06 +0000 (11:24 +0200)]
Merge pull request #833 from nextcloud/stable10-backport-819

[stable10] Theming support for apps

8 years agoTheming: Add OCA.Theming Js for app interaction 833/head
Julius Haertl [Wed, 10 Aug 2016 09:53:33 +0000 (11:53 +0200)]
Theming: Add OCA.Theming Js for app interaction

8 years agoAdd css classes to allow app developers using the theming colors
Julius Haertl [Tue, 9 Aug 2016 20:54:25 +0000 (22:54 +0200)]
Add css classes to allow app developers using the theming colors

8 years agoMerge pull request #811 from nextcloud/shared-cachethepropagatorinstance-stable10
Lukas Reschke [Wed, 10 Aug 2016 15:24:44 +0000 (17:24 +0200)]
Merge pull request #811 from nextcloud/shared-cachethepropagatorinstance-stable10

Store the shared propagator instance

8 years agoMerge pull request #809 from nextcloud/skip_expiry_for_users_that_never_logged_in...
Lukas Reschke [Wed, 10 Aug 2016 14:31:19 +0000 (16:31 +0200)]
Merge pull request #809 from nextcloud/skip_expiry_for_users_that_never_logged_in-stable10

Skip version and trash expiry for users that never logged in

8 years agoMerge pull request #817 from nextcloud/jail-root-stable10
Lukas Reschke [Wed, 10 Aug 2016 14:04:13 +0000 (16:04 +0200)]
Merge pull request #817 from nextcloud/jail-root-stable10

[stable10] getJailedPath expects $path to have a trailing /

8 years agoMerge pull request #822 from nextcloud/shared-storage-lazy-numeric-id-10
Lukas Reschke [Wed, 10 Aug 2016 14:03:21 +0000 (16:03 +0200)]
Merge pull request #822 from nextcloud/shared-storage-lazy-numeric-id-10

[10] get shared storage storage id without setting up the storage

8 years agoMerge pull request #825 from nextcloud/add-warning-for-php7.1-stable10
Lukas Reschke [Wed, 10 Aug 2016 14:02:58 +0000 (16:02 +0200)]
Merge pull request #825 from nextcloud/add-warning-for-php7.1-stable10

[stable10] Nextcloud is not compatible with PHP 7.1

8 years agoMerge pull request #821 from nextcloud/stable10_806
Lukas Reschke [Wed, 10 Aug 2016 14:00:25 +0000 (16:00 +0200)]
Merge pull request #821 from nextcloud/stable10_806

[Stable10] Token polish

8 years agoMerge pull request #823 from nextcloud/stable10_807
Björn Schießle [Wed, 10 Aug 2016 13:26:23 +0000 (15:26 +0200)]
Merge pull request #823 from nextcloud/stable10_807

[Stable10] OCSController requires DataResponse

8 years ago[stable10] Nextcloud is not compatible with PHP 7.1 825/head
Lukas Reschke [Wed, 10 Aug 2016 12:28:50 +0000 (14:28 +0200)]
[stable10] Nextcloud is not compatible with PHP 7.1

Make the code fail hard before people update and then experience some half-broken stuff. See also https://github.com/nextcloud/docker-ci/issues/10

8 years agoOCSController requires DataResponse 823/head
Roeland Jago Douma [Tue, 9 Aug 2016 08:03:16 +0000 (10:03 +0200)]
OCSController requires DataResponse

The OCS Controller requires a DataResponse object to be returned.
This means that all error handling will have to be done via exceptions
thrown and handling in the middleware.

8 years agoget shared storage storage id without setting up the storage 822/head
Robin Appelman [Tue, 9 Aug 2016 13:52:13 +0000 (15:52 +0200)]
get shared storage storage id without setting up the storage

8 years agoMerge pull request #815 from nextcloud/fix-undefined-offset-in-login-controller-stable10
Björn Schießle [Wed, 10 Aug 2016 10:50:22 +0000 (12:50 +0200)]
Merge pull request #815 from nextcloud/fix-undefined-offset-in-login-controller-stable10

[stable10] Add missing array element

8 years agoadd more margin to right of the icon 821/head
Morris Jobke [Wed, 10 Aug 2016 08:47:51 +0000 (10:47 +0200)]
add more margin to right of the icon

8 years agoAdd sliding animation
Roeland Jago Douma [Wed, 10 Aug 2016 07:17:14 +0000 (09:17 +0200)]
Add sliding animation

8 years agoAdd clipboardjs for token
Roeland Jago Douma [Wed, 10 Aug 2016 07:10:39 +0000 (09:10 +0200)]
Add clipboardjs for token

8 years agoAlways show delete icon for new tokens
Roeland Jago Douma [Wed, 10 Aug 2016 06:58:57 +0000 (08:58 +0200)]
Always show delete icon for new tokens

* Always show delete icon
* Hide form if the new icon is deleted

8 years agoAdd note password is only shown once
Roeland Jago Douma [Wed, 10 Aug 2016 06:58:41 +0000 (08:58 +0200)]
Add note password is only shown once

8 years agoAdding test case for getPathById including a jailed cache where root is just empty 817/head
Thomas Müller [Fri, 5 Aug 2016 11:32:26 +0000 (13:32 +0200)]
Adding test case for getPathById including a jailed cache where root is just empty

8 years agogetJailedPath expects $path to have a trailing / - fixes #25464
Thomas Müller [Fri, 5 Aug 2016 09:13:43 +0000 (11:13 +0200)]
getJailedPath expects $path to have a trailing / - fixes #25464

8 years ago[stable9.1] Add missing array element - fixes #25714 815/head
Thomas Müller [Mon, 8 Aug 2016 06:08:29 +0000 (08:08 +0200)]
[stable9.1] Add missing array element - fixes #25714

8 years agoStore the shared propagator instance 811/head
Vincent Petry [Mon, 18 Jul 2016 09:35:14 +0000 (11:35 +0200)]
Store the shared propagator instance

This instead of recreating it for every call.

8 years agoSkip version and trash expiry for users that never logged in 809/head
Jörn Friedrich Dreyer [Tue, 9 Aug 2016 10:28:53 +0000 (12:28 +0200)]
Skip version and trash expiry for users that never logged in

8 years agoMerge pull request #805 from nextcloud/stable10_799
Morris Jobke [Wed, 10 Aug 2016 08:41:56 +0000 (10:41 +0200)]
Merge pull request #805 from nextcloud/stable10_799

[Stable10] Open exiration date picker directly on toggle

8 years agoOpen exiration date picker directly on toggle 805/head
Roeland Jago Douma [Tue, 9 Aug 2016 17:55:58 +0000 (19:55 +0200)]
Open exiration date picker directly on toggle

8 years agoMerge pull request #804 from nextcloud/10-admin_php_smtp_casing
Roeland Jago Douma [Wed, 10 Aug 2016 06:20:11 +0000 (08:20 +0200)]
Merge pull request #804 from nextcloud/10-admin_php_smtp_casing

[stable10] Admin setting PHP and SMTP casing

8 years agoMerge pull request #743 from nextcloud/fix_smb_attributes-10
Lukas Reschke [Tue, 9 Aug 2016 22:23:17 +0000 (00:23 +0200)]
Merge pull request #743 from nextcloud/fix_smb_attributes-10

[10] Fix file permissions for SMB (read-only folders will be writeable

8 years agoMerge pull request #803 from nextcloud/use-correct-version
Lukas Reschke [Tue, 9 Aug 2016 22:14:46 +0000 (00:14 +0200)]
Merge pull request #803 from nextcloud/use-correct-version

Use correct version

8 years agoAdmin setting PHP and SMTP casing 804/head
Roeland Jago Douma [Tue, 9 Aug 2016 12:12:39 +0000 (14:12 +0200)]
Admin setting PHP and SMTP casing

8 years agoUse correct version 803/head
Lukas Reschke [Tue, 9 Aug 2016 21:02:42 +0000 (23:02 +0200)]
Use correct version

Fixes https://github.com/nextcloud/server/issues/800, other apps such as fileaccesscontrol and workflow already have the correct version.

8 years agoMerge pull request #798 from nextcloud/stable10_781
Roeland Jago Douma [Tue, 9 Aug 2016 19:54:07 +0000 (21:54 +0200)]
Merge pull request #798 from nextcloud/stable10_781

[Stable10] Remove AGPL title

8 years agoMerge pull request #794 from nextcloud/stable10_780
Roeland Jago Douma [Tue, 9 Aug 2016 18:47:47 +0000 (20:47 +0200)]
Merge pull request #794 from nextcloud/stable10_780

[Stable10] Add clipboard action to Personal Settings Fed Cloud Id

8 years agoMerge pull request #795 from nextcloud/stable10-backport-786
Björn Schießle [Tue, 9 Aug 2016 18:33:17 +0000 (20:33 +0200)]
Merge pull request #795 from nextcloud/stable10-backport-786

[stable10] log class name, ID only is hard to debug

8 years agoMerge pull request #792 from nextcloud/stable10_789
Björn Schießle [Tue, 9 Aug 2016 17:34:05 +0000 (19:34 +0200)]
Merge pull request #792 from nextcloud/stable10_789

[Stable10] Padding of federated server

8 years agoRemove AGPL title 798/head
Roeland Jago Douma [Tue, 9 Aug 2016 11:37:25 +0000 (13:37 +0200)]
Remove AGPL title

8 years agolog class name, ID only is hard to debug 795/head
Jörn Friedrich Dreyer [Tue, 9 Aug 2016 10:26:32 +0000 (12:26 +0200)]
log class name, ID only is hard to debug

8 years agoAdd clipboard action to Personal Settings Fed Cloud Id 794/head
Roeland Jago Douma [Tue, 9 Aug 2016 11:14:55 +0000 (13:14 +0200)]
Add clipboard action to Personal Settings Fed Cloud Id

8 years agoPadding of federated server 792/head
Roeland Jago Douma [Tue, 9 Aug 2016 12:33:21 +0000 (14:33 +0200)]
Padding of federated server

8 years agoMerge pull request #788 from nextcloud/stable10-federation-error-messages
Björn Schießle [Tue, 9 Aug 2016 13:50:33 +0000 (15:50 +0200)]
Merge pull request #788 from nextcloud/stable10-federation-error-messages

[stable10] improve federation error messages

8 years agoMerge pull request #785 from nextcloud/stable10_779
Roeland Jago Douma [Tue, 9 Aug 2016 13:47:52 +0000 (15:47 +0200)]
Merge pull request #785 from nextcloud/stable10_779

[Stable10] Make 'Add to your website' toggleable

8 years agoimprove federation error messages 788/head
Bjoern Schiessle [Mon, 8 Aug 2016 12:56:24 +0000 (14:56 +0200)]
improve federation error messages

8 years agoMake 'Add to your website' toggleable 785/head
Roeland Jago Douma [Tue, 9 Aug 2016 10:21:10 +0000 (12:21 +0200)]
Make 'Add to your website' toggleable

8 years agoMerge pull request #776 from nextcloud/workflow-cleanup-stable10
Björn Schießle [Tue, 9 Aug 2016 10:36:03 +0000 (12:36 +0200)]
Merge pull request #776 from nextcloud/workflow-cleanup-stable10

[stable10] Workflow cleanup

8 years agoAllow a description for workflow sections 776/head
Joas Schilling [Fri, 5 Aug 2016 13:18:15 +0000 (15:18 +0200)]
Allow a description for workflow sections

8 years agoAdd placeholder to the name field
Joas Schilling [Fri, 5 Aug 2016 13:15:27 +0000 (15:15 +0200)]
Add placeholder to the name field

8 years agoRename operations and checks
Joas Schilling [Fri, 5 Aug 2016 13:14:40 +0000 (15:14 +0200)]
Rename operations and checks

8 years agoHighlight the check row on hover
Joas Schilling [Fri, 5 Aug 2016 13:13:22 +0000 (15:13 +0200)]
Highlight the check row on hover

8 years agoAdd some space between the rule groups
Joas Schilling [Fri, 5 Aug 2016 13:12:57 +0000 (15:12 +0200)]
Add some space between the rule groups

8 years agoMerge pull request #773 from nextcloud/stable10-fix-systemtags-icon
Roeland Jago Douma [Mon, 8 Aug 2016 19:35:19 +0000 (21:35 +0200)]
Merge pull request #773 from nextcloud/stable10-fix-systemtags-icon

[stable10] Add black version of system tags icon

8 years agoAdd black version of system tags icon 773/head
Bugsbane [Mon, 8 Aug 2016 07:08:46 +0000 (03:08 -0400)]
Add black version of system tags icon

Includes PNG (16x16px) and SVG (scoured) versions in black, to be uniform with the other icon files.

8 years agoMerge pull request #738 from nextcloud/increment-versions
Roeland Jago Douma [Mon, 8 Aug 2016 16:26:30 +0000 (18:26 +0200)]
Merge pull request #738 from nextcloud/increment-versions

[stable10] Increment the versions and adjust the capitilization

8 years agoFix intergration test for admin_audit 738/head
Roeland Jago Douma [Mon, 8 Aug 2016 14:48:10 +0000 (16:48 +0200)]
Fix intergration test for admin_audit

8 years agoDisable by default
Joas Schilling [Fri, 5 Aug 2016 13:53:09 +0000 (15:53 +0200)]
Disable by default

8 years agoMore casing
Joas Schilling [Fri, 5 Aug 2016 13:50:17 +0000 (15:50 +0200)]
More casing

8 years agoIncrement the versions and adjust the capitilization
Joas Schilling [Thu, 4 Aug 2016 17:52:03 +0000 (19:52 +0200)]
Increment the versions and adjust the capitilization

8 years agoMerge pull request #713 from nextcloud/stable10_474
Björn Schießle [Mon, 8 Aug 2016 08:55:26 +0000 (10:55 +0200)]
Merge pull request #713 from nextcloud/stable10_474

[Stable 10] Group shares with same source and target

8 years agoMerge pull request #756 from nextcloud/twofactor-isset-10
Morris Jobke [Mon, 8 Aug 2016 07:15:13 +0000 (09:15 +0200)]
Merge pull request #756 from nextcloud/twofactor-isset-10

[10] Check if an app provide two-factor-auth providers before we try to use them

8 years agoDisable buggy test for now 713/head
Roeland Jago Douma [Sun, 7 Aug 2016 12:05:54 +0000 (14:05 +0200)]
Disable buggy test for now

8 years agoMerge pull request #757 from nextcloud/nextcloud-version-check-10
Marius Blüm [Sun, 7 Aug 2016 07:08:49 +0000 (09:08 +0200)]
Merge pull request #757 from nextcloud/nextcloud-version-check-10

[10] Translate the server version for nextcloud

8 years agoTranslate the server version for nextcloud 757/head
Joas Schilling [Mon, 25 Jul 2016 14:13:34 +0000 (16:13 +0200)]
Translate the server version for nextcloud

8 years agoCheck if an app provide two-factor-auth providers before we try to use them 756/head
Robin Appelman [Sat, 23 Jul 2016 11:26:57 +0000 (13:26 +0200)]
Check if an app provide two-factor-auth providers before we try to use them

8 years agoMerge pull request #748 from nextcloud/stable10-backport-name-changes
blizzz [Fri, 5 Aug 2016 13:42:40 +0000 (15:42 +0200)]
Merge pull request #748 from nextcloud/stable10-backport-name-changes

[stable10] correct name

8 years agoownCloud -> Nextcloud 748/head
Daniel Hansson [Thu, 28 Jul 2016 18:55:26 +0000 (20:55 +0200)]
ownCloud -> Nextcloud

8 years agoCorrect name in Console Application.php
blizzz [Thu, 4 Aug 2016 17:17:13 +0000 (19:17 +0200)]
Correct name in Console Application.php

see changes :)

8 years agoMerge pull request #705 from nextcloud/backport-408-psr4-for-theming
Julius Härtl [Fri, 5 Aug 2016 09:51:42 +0000 (11:51 +0200)]
Merge pull request #705 from nextcloud/backport-408-psr4-for-theming

[stable10] Theming input validation

8 years agoFix file permissions for SMB (read-only folders will be writeable) (#25301) 743/head
Juan Pablo Villafañez [Wed, 20 Jul 2016 12:22:04 +0000 (14:22 +0200)]
Fix file permissions for SMB (read-only folders will be writeable) (#25301)

* Fix file permissions for SMB (read-only folders will be writeable)

* Read-only folders won't be deletable

* Added comment for the read-only behaviour for folders

8 years agoMake share target consistent when grouping group share with user share
Vincent Petry [Fri, 22 Jul 2016 13:30:13 +0000 (15:30 +0200)]
Make share target consistent when grouping group share with user share

In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.

To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.

This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.

8 years agoAdd integration tests for double shares with rename in between
Vincent Petry [Fri, 22 Jul 2016 09:42:21 +0000 (11:42 +0200)]
Add integration tests for double shares with rename in between

8 years agoFix RepairUnmergedShares to not skip valid repair cases
Vincent Petry [Fri, 22 Jul 2016 08:08:05 +0000 (10:08 +0200)]
Fix RepairUnmergedShares to not skip valid repair cases

The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.

8 years agoAdjust repair version check for unmerged shares
Vincent Petry [Thu, 14 Jul 2016 12:53:50 +0000 (14:53 +0200)]
Adjust repair version check for unmerged shares

8 years agoGroup incoming shares for resharing in JS
Vincent Petry [Wed, 13 Jul 2016 13:46:02 +0000 (15:46 +0200)]
Group incoming shares for resharing in JS

8 years agoAdded more tests for sharing's MountProvider
Vincent Petry [Wed, 13 Jul 2016 10:50:00 +0000 (12:50 +0200)]
Added more tests for sharing's MountProvider

8 years agoAdd repair step for unmerged shares (WIP)
Vincent Petry [Tue, 12 Jul 2016 11:38:49 +0000 (13:38 +0200)]
Add repair step for unmerged shares (WIP)

8 years agoImproved share grouping readability + fixed test
Vincent Petry [Mon, 11 Jul 2016 17:43:46 +0000 (19:43 +0200)]
Improved share grouping readability + fixed test

8 years agoAdd integration tests for merging received shares
Vincent Petry [Mon, 11 Jul 2016 15:33:24 +0000 (17:33 +0200)]
Add integration tests for merging received shares

8 years agoGroup shares with same source and target
Roeland Jago Douma [Wed, 15 Jun 2016 07:47:33 +0000 (09:47 +0200)]
Group shares with same source and target

Fixes #24575

Note that this is a very limited solution and eventually we want smarter
merging!

8 years agoMerge pull request #733 from nextcloud/fix-724-stable10
Bernhard Posselt [Thu, 4 Aug 2016 14:23:53 +0000 (16:23 +0200)]
Merge pull request #733 from nextcloud/fix-724-stable10

Backport Stable 10: Fix #724 by using step instead of job

8 years agoMerge pull request #731 from nextcloud/stable10-add-new-apps-as-official
Lukas Reschke [Thu, 4 Aug 2016 14:09:38 +0000 (16:09 +0200)]
Merge pull request #731 from nextcloud/stable10-add-new-apps-as-official

[stable10] Add new apps as official

8 years agofix #724 by using step instead of job 733/head
Bernhard Posselt [Thu, 4 Aug 2016 11:32:03 +0000 (13:32 +0200)]
fix #724 by using step instead of job

8 years agoMerge pull request #727 from jurgenhaas/patch-2
Joas Schilling [Thu, 4 Aug 2016 12:45:28 +0000 (14:45 +0200)]
Merge pull request #727 from jurgenhaas/patch-2

Backport of #718

8 years agoOrder alphabetically and deduplicate the shipped.json 731/head
Joas Schilling [Thu, 4 Aug 2016 12:40:43 +0000 (14:40 +0200)]
Order alphabetically and deduplicate the shipped.json

8 years ago[stable10] Add new apps as official
Lukas Reschke [Thu, 4 Aug 2016 12:28:24 +0000 (14:28 +0200)]
[stable10] Add new apps as official

8 years agoMerge pull request #602 from nextcloud/backport-workflow-engine
Joas Schilling [Thu, 4 Aug 2016 12:20:14 +0000 (14:20 +0200)]
Merge pull request #602 from nextcloud/backport-workflow-engine

🚧 [WIP] Backport workflow engine 🚧

8 years agoBackport of #718 727/head
Jürgen Haas [Thu, 4 Aug 2016 07:14:40 +0000 (09:14 +0200)]
Backport of #718

Backporting https://github.com/nextcloud/server/pull/718 to stable10

8 years agoMerge pull request #706 from nextcloud/backport-637-prevent-delete-update-on-group...
Björn Schießle [Wed, 3 Aug 2016 12:52:49 +0000 (14:52 +0200)]
Merge pull request #706 from nextcloud/backport-637-prevent-delete-update-on-group-shares

[stable10] Do not allow to delete/update group shares as a group member

8 years agoAdd access control and automated tagging as shipped 602/head
Joas Schilling [Wed, 3 Aug 2016 12:47:52 +0000 (14:47 +0200)]
Add access control and automated tagging as shipped

8 years agoOoops
Joas Schilling [Tue, 2 Aug 2016 10:52:46 +0000 (12:52 +0200)]
Ooops

8 years agoNo multi support, less magic
Joas Schilling [Tue, 2 Aug 2016 08:41:13 +0000 (10:41 +0200)]
No multi support, less magic

8 years agoAllow to define the operation
Joas Schilling [Tue, 2 Aug 2016 07:56:19 +0000 (09:56 +0200)]
Allow to define the operation