]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
5 years agoMerge pull request #14670 from nextcloud/bugfix/noid/theming-css-vars
Julius Härtl [Thu, 14 Mar 2019 07:51:21 +0000 (08:51 +0100)]
Merge pull request #14670 from nextcloud/bugfix/noid/theming-css-vars

Use SCSS variables since CSS vars are not loaded on public pages

5 years agoUse SCSS variables since CSS vars are not loaded on public pages 14670/head
Julius Härtl [Wed, 13 Mar 2019 21:09:36 +0000 (22:09 +0100)]
Use SCSS variables since CSS vars are not loaded on public pages

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoMerge pull request #14663 from nextcloud/remove_userExternal_example
Roeland Jago Douma [Wed, 13 Mar 2019 20:45:10 +0000 (21:45 +0100)]
Merge pull request #14663 from nextcloud/remove_userExternal_example

remove user_external example from config.sample.php

5 years agoMerge pull request #14640 from nextcloud/techdebt/noid/disable-failing-tests
Morris Jobke [Wed, 13 Mar 2019 20:29:59 +0000 (21:29 +0100)]
Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-tests

Disable fragile tests

5 years ago👌 IMPROVE: remove user_external example from config.sample.php 14663/head
Jonas Sulzer [Wed, 13 Mar 2019 17:14:03 +0000 (18:14 +0100)]
👌 IMPROVE: remove user_external example from config.sample.php

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
5 years agoWait up to 10 seconds for incoming changes from SMB notifier 14640/head
Morris Jobke [Tue, 12 Mar 2019 16:16:03 +0000 (17:16 +0100)]
Wait up to 10 seconds for incoming changes from SMB notifier

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable fragile user acceptance tests
Morris Jobke [Tue, 12 Mar 2019 16:06:04 +0000 (17:06 +0100)]
Disable fragile user acceptance tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing login test
Morris Jobke [Tue, 12 Mar 2019 15:39:57 +0000 (16:39 +0100)]
Disable failing login test

 * tests/acceptance/features/login.feature:15
<details><summary>Show full log</summary>

```
  Scenario: log in with valid user and invalid password once fixed by admin # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:15
    Given I act as John                                                     # ActorContext::iActAs()
    And I can not log in with user user0 and password 654231                # LoginPageContext::iCanNotLogInWithUserAndPassword()
    When I act as Jane                                                      # ActorContext::iActAs()
    And I am logged in as the admin                                         # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                            # SettingsMenuContext::iOpenTheUserSettings()
    And I set the password for user0 to 654321                              # UsersSettingsContext::iSetTheFieldForUserTo()
    And I act as John                                                       # ActorContext::iActAs()
    And I log in with user user0 and password 654321                        # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Files app                       # FilesAppContext::iSeeThatTheCurrentPageIsTheFilesApp()
      Failed asserting that 'http://acceptance-login/index.php/login?user=user0' starts with "http://acceptance-login/index.php/apps/files/".

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing comments test
Morris Jobke [Tue, 12 Mar 2019 13:38:55 +0000 (14:38 +0100)]
Disable failing comments test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files app test
Morris Jobke [Tue, 12 Mar 2019 12:41:55 +0000 (13:41 +0100)]
Disable failing files app test

Fails with:

 * tests/acceptance/features/app-files.feature:90
<details><summary>Show full log</summary>

```
  Scenario: show favorites                                            # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:90
    Given I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I mark "welcome.txt" as favorite                              # FileListContext::iMarkAsFavorite()
    When I open the "Favorites" section                               # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Favorites"                # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "welcome.txt" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing apps management test
Morris Jobke [Tue, 12 Mar 2019 12:14:25 +0000 (13:14 +0100)]
Disable failing apps management test

Fails with:

 * tests/acceptance/features/apps.feature:66
<details><summary>Show full log</summary>

```
  Scenario: Show section from app store                       # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:66
    Given I act as Jane                                       # ActorContext::iActAs()
    And I am logged in as the admin                           # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the Apps management                            # SettingsMenuContext::iOpenTheAppsManagement()
    And I see that the current section is "Your apps"         # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    When I open the "Files" section                           # AppNavigationContext::iOpenTheSection()
      Files section item in App Navigation could not be found after 100 seconds (NoSuchElementException)
    Then I see that there some apps listed from the app store # AppsManagementContext::iSeeThatThereSomeAppsListedFromTheAppStore()
    And I see that the current section is "Files"             # AppNavigationContext::iSeeThatTheCurrentSectionIs()

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files tag test
Morris Jobke [Tue, 12 Mar 2019 12:13:10 +0000 (13:13 +0100)]
Disable failing files tag test

Fails with:

 * tests/acceptance/features/app-files-tags.feature:42
<details><summary>Show full log</summary>

```
  Scenario: add tags using the dropdown in the details view                                 # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:42
    Given I am logged in as the admin                                                       # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                           # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Tag management" section                                                 # AppNavigationContext::iOpenTheSection()
    And I see that the button to select tags is shown                                       # SettingsContext::iSeeThatTheButtonToSelectTagsIsShown()
    And I create the tag "tag1" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag2" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag3" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag4" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag1" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag2" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag3" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag4" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I log out                                                                           # SettingsMenuContext::iLogOut()
    And I am logged in                                                                      # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                                           # FileListContext::iOpenTheDetailsViewFor()
    And I open the input field for tags in the details view                                 # FilesAppContext::iOpenTheInputFieldForTagsInTheDetailsView()
    When I check the tag "tag2" in the dropdown for tags in the details view                # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    And I check the tag "tag4" in the dropdown for tags in the details view                 # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    Then I see that the tag "tag2" in the dropdown for tags in the details view is checked  # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the tag "tag4" in the dropdown for tags in the details view is checked   # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the input field for tags in the details view contains the tag "tag2"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()
      Failed asserting that false is true.
    And I see that the input field for tags in the details view contains the tag "tag4"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing federated sharing tests
Morris Jobke [Tue, 12 Mar 2019 12:05:23 +0000 (13:05 +0100)]
Disable failing federated sharing tests

Fails with:

 * build/integration/federation_features/federated.feature:183
 * build/integration/federation_features/federated.feature:232
 * build/integration/federation_features/federated.feature:247
 * build/integration/federation_features/federated.feature:263
<details><summary>Show full log</summary>

```
  Scenario: Reshare a federated shared file                                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:183
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
    When creating a share with                                                                          # FederationContext::creatingShare()
      | path        | /textfile0 (2).txt |
      | shareType   | 0                  |
      | shareWith   | user2              |
      | permissions | 19                 |
    Then the OCS status code should be "100"                                                            # FederationContext::theOCSStatusCodeShouldBe()
      Failed asserting that SimpleXMLElement Object &000000007d8e0d3c00000000403fd08a (
          0 => '404'
      ) matches expected '100'.
    ...
{"message":"Can not find share with ID: 8"}

  Scenario: Overwrite a federated shared folder as recipient                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:232
    Given Using server "REMOTE"                                                                          # FederationContext::usingServer()
    And user "user1" exists                                                                              # FederationContext::assureUserExists()
    And user "user2" exists                                                                              # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                             # FederationContext::usingServer()
    And user "user0" exists                                                                              # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE"         # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                                     # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                            # FederationContext::usingServer()
    And As an "user1"                                                                                    # FederationContext::asAn()
    And User "user1" modifies text of "/textfile0.txt" with text "BLABLABLA"                             # FederationContext::modifyTextOfFile()
    When User "user1" uploads file "../../data/user1/files/textfile0.txt" to "/PARENT (2)/textfile0.txt" # FederationContext::userUploadsAFileTo()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    ...
{"message":"Can not find share with ID: 10"}

  Scenario: Overwrite a federated shared file as recipient using old chunking                           # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:247
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/textfile0%20(2).txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    ...
{"message":"Can not find share with ID: 11"}

  Scenario: Overwrite a federated shared folder as recipient using old chunking                  # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:263
    Given Using server "REMOTE"                                                                  # FederationContext::usingServer()
    And user "user1" exists                                                                      # FederationContext::assureUserExists()
    And user "user2" exists                                                                      # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                     # FederationContext::usingServer()
    And user "user0" exists                                                                      # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                             # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                    # FederationContext::usingServer()
    And As an "user1"                                                                            # FederationContext::asAn()
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    ...
{"message":"Can not find share with ID: 12"}

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDo not run fragile TrashbinTest
Morris Jobke [Tue, 12 Mar 2019 11:56:19 +0000 (12:56 +0100)]
Do not run fragile TrashbinTest

Fails with:

There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

OR

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14656 from nextcloud/trash-prevent-recursion
Morris Jobke [Wed, 13 Mar 2019 16:16:48 +0000 (17:16 +0100)]
Merge pull request #14656 from nextcloud/trash-prevent-recursion

prevent recursion when moving a file to the trashbin

5 years agoMerge pull request #14644 from nextcloud/fix/noid/remove-sensitive-smb-values
Roeland Jago Douma [Wed, 13 Mar 2019 13:00:02 +0000 (14:00 +0100)]
Merge pull request #14644 from nextcloud/fix/noid/remove-sensitive-smb-values

Remove sensitive SMB arguments from exception log

5 years agoprevent recursion when moving a file to the trashbin 14656/head
Robin Appelman [Wed, 13 Mar 2019 10:42:01 +0000 (11:42 +0100)]
prevent recursion when moving a file to the trashbin

Signed-off-by: Robin Appelman <robin@icewind.nl>
5 years agoMerge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav
Morris Jobke [Tue, 12 Mar 2019 23:06:46 +0000 (00:06 +0100)]
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav

Change CALDAV to allow calendars be shared with circles.

5 years agoFix PHPUnit 6512/head
Morris Jobke [Tue, 12 Mar 2019 17:41:37 +0000 (18:41 +0100)]
Fix PHPUnit

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoFix PHPUnit
Morris Jobke [Tue, 12 Mar 2019 17:27:59 +0000 (18:27 +0100)]
Fix PHPUnit

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoRemove sensitive SMB arguments from exception log 14644/head
Morris Jobke [Tue, 12 Mar 2019 14:51:38 +0000 (15:51 +0100)]
Remove sensitive SMB arguments from exception log

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14626 from nextcloud/bugfix/14621/make-sure-urlparams-are-correct...
Morris Jobke [Tue, 12 Mar 2019 11:46:54 +0000 (12:46 +0100)]
Merge pull request #14626 from nextcloud/bugfix/14621/make-sure-urlparams-are-correctly-injected-in-global-routes

Make sure urlparams are correctly injected in global routes

5 years agoMerge pull request #14586 from nextcloud/hint-user-docs-federation
Morris Jobke [Mon, 11 Mar 2019 19:03:29 +0000 (20:03 +0100)]
Merge pull request #14586 from nextcloud/hint-user-docs-federation

Add hint to user documentation (Federation)

5 years agoMerge pull request #14623 from nextcloud/fix/noid/login-page-wrong-password
Morris Jobke [Mon, 11 Mar 2019 11:49:05 +0000 (12:49 +0100)]
Merge pull request #14623 from nextcloud/fix/noid/login-page-wrong-password

Fix acceptance tests for wrong password message due to changed message

5 years agoFix display of i in personal settings 14586/head
Morris Jobke [Mon, 11 Mar 2019 11:34:20 +0000 (12:34 +0100)]
Fix display of i in personal settings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoAdd hint to user documentation (Federation)
Marius Blüm [Thu, 7 Mar 2019 13:02:51 +0000 (14:02 +0100)]
Add hint to user documentation (Federation)

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoAdd a message about disabled global routes 14626/head
Joas Schilling [Mon, 11 Mar 2019 11:43:39 +0000 (12:43 +0100)]
Add a message about disabled global routes

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMake sure urlParams are correctly injected in global routes
Joas Schilling [Mon, 11 Mar 2019 11:30:44 +0000 (12:30 +0100)]
Make sure urlParams are correctly injected in global routes

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMerge pull request #14620 from nextcloud/fix/noid/copy-paste-typo
Morris Jobke [Mon, 11 Mar 2019 11:01:27 +0000 (12:01 +0100)]
Merge pull request #14620 from nextcloud/fix/noid/copy-paste-typo

Fix unneeded doc link to unrelated resource

5 years agoFix acceptance tests for wrong password message due to changed message 14623/head
Morris Jobke [Mon, 11 Mar 2019 10:54:38 +0000 (11:54 +0100)]
Fix acceptance tests for wrong password message due to changed message

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoFix unneeded doc link to unrelated resource 14620/head
Morris Jobke [Mon, 11 Mar 2019 10:00:21 +0000 (11:00 +0100)]
Fix unneeded doc link to unrelated resource

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14603 from nextcloud/fix/noid/add-setup-check-for-s3-temp-path
Morris Jobke [Fri, 8 Mar 2019 17:03:49 +0000 (18:03 +0100)]
Merge pull request #14603 from nextcloud/fix/noid/add-setup-check-for-s3-temp-path

Show a setup warning in case S3 object storage is used as primary storage

5 years agoMerge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1
Roeland Jago Douma [Fri, 8 Mar 2019 14:32:16 +0000 (15:32 +0100)]
Merge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1

[Security] Bump bootstrap from 3.4.1 to 4.3.1

5 years agoShow a setup warning in case S3 object storage is used as primary storage 14603/head
Morris Jobke [Fri, 8 Mar 2019 12:36:11 +0000 (13:36 +0100)]
Show a setup warning in case S3 object storage is used as primary storage

* checks for at least 50 GB of free space

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-container-creation
Morris Jobke [Fri, 8 Mar 2019 09:31:10 +0000 (10:31 +0100)]
Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-container-creation

Avoid duplicate App container creation

5 years agoMerge pull request #14590 from Worteks/master
Morris Jobke [Fri, 8 Mar 2019 08:45:33 +0000 (09:45 +0100)]
Merge pull request #14590 from Worteks/master

Update index.php

5 years agoMerge pull request #14585 from nextcloud/ocm-mention-federation
Morris Jobke [Fri, 8 Mar 2019 08:42:22 +0000 (09:42 +0100)]
Merge pull request #14585 from nextcloud/ocm-mention-federation

Mention Open Cloud Mesh in Federated User Settings

5 years agoMerge pull request #14589 from nextcloud/feature/noid/add-preview-information-as...
Morris Jobke [Fri, 8 Mar 2019 08:41:33 +0000 (09:41 +0100)]
Merge pull request #14589 from nextcloud/feature/noid/add-preview-information-as-optional-data

Add preview data as optional data for files

5 years agoMerge pull request #14425 from cowai/fix-multiple-incomplete-folders
Morris Jobke [Fri, 8 Mar 2019 08:12:33 +0000 (09:12 +0100)]
Merge pull request #14425 from cowai/fix-multiple-incomplete-folders

Do not calculate folder size for parent that also needs proper scan, fixes #3524

5 years agoMerge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundle
Morris Jobke [Fri, 8 Mar 2019 08:05:07 +0000 (09:05 +0100)]
Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundle

Remove Google+ from Social Sharing Bundle

5 years agoMerge pull request #14583 from nextcloud/remove-g+-federation
Morris Jobke [Fri, 8 Mar 2019 08:04:01 +0000 (09:04 +0100)]
Merge pull request #14583 from nextcloud/remove-g+-federation

Remove Google+ federation usersettings

5 years agoMerge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter
blizzz [Thu, 7 Mar 2019 21:31:51 +0000 (22:31 +0100)]
Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter

resolve user and groups in nested groups first before filtering the results

5 years agoUpdate index.php 14590/head
paul [Thu, 7 Mar 2019 21:05:38 +0000 (22:05 +0100)]
Update index.php

Linking to NC 15 documentation instead of NC 13

5 years agoAdd preview data as optional data for files 14589/head
Joas Schilling [Thu, 7 Mar 2019 18:47:40 +0000 (19:47 +0100)]
Add preview data as optional data for files

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoRemove Google+ from Social Sharing Bundle (2) 14587/head
Marius Blüm [Thu, 7 Mar 2019 13:57:56 +0000 (14:57 +0100)]
Remove Google+ from Social Sharing Bundle (2)

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoRemove "socialsharing_googleplus" from Social Sharing Bundle
Marius Blüm [Thu, 7 Mar 2019 13:56:16 +0000 (14:56 +0100)]
Remove "socialsharing_googleplus" from Social Sharing Bundle

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoRemove G+ CSS rule (Feedback from Joas) 14583/head
Marius Blüm [Thu, 7 Mar 2019 13:28:36 +0000 (14:28 +0100)]
Remove G+ CSS rule (Feedback from Joas)

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoMention Open Cloud Mesh in Federated User Settings 14585/head
Marius Blüm [Thu, 7 Mar 2019 12:55:09 +0000 (13:55 +0100)]
Mention Open Cloud Mesh in Federated User Settings

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoRemove G+ code from Federated Files Sharing-usersettings
Marius Blüm [Thu, 7 Mar 2019 12:46:49 +0000 (13:46 +0100)]
Remove G+ code from Federated Files Sharing-usersettings

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoRemove G+ icon from Federated Files Sharing-usersettings
Marius Blüm [Thu, 7 Mar 2019 12:45:23 +0000 (13:45 +0100)]
Remove G+ icon from Federated Files Sharing-usersettings

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoMerge pull request #14579 from nextcloud/fix/bump_streams_files_external
Roeland Jago Douma [Thu, 7 Mar 2019 11:53:07 +0000 (12:53 +0100)]
Merge pull request #14579 from nextcloud/fix/bump_streams_files_external

Have streams of files_external in sync

5 years agoHave streams of files_external in sync 14579/head
Roeland Jago Douma [Thu, 7 Mar 2019 11:15:32 +0000 (12:15 +0100)]
Have streams of files_external in sync

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoBump bundles 14352/head
Julius Härtl [Wed, 6 Mar 2019 19:00:36 +0000 (20:00 +0100)]
Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoAdd wrapper for removed tooltip functions
Julius Härtl [Wed, 6 Mar 2019 18:47:12 +0000 (19:47 +0100)]
Add wrapper for removed tooltip functions

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoFix domparser on phantomjs
Julius Härtl [Fri, 1 Mar 2019 16:06:48 +0000 (17:06 +0100)]
Fix domparser on phantomjs

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoUse tooltip dist file
Julius Härtl [Fri, 1 Mar 2019 13:48:08 +0000 (14:48 +0100)]
Use tooltip dist file

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoFix tooltip styling for bootstrap 4.3
Julius Härtl [Mon, 25 Feb 2019 06:35:54 +0000 (07:35 +0100)]
Fix tooltip styling for bootstrap 4.3

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoFix tooltip include
Julius Härtl [Sun, 24 Feb 2019 10:24:19 +0000 (11:24 +0100)]
Fix tooltip include

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years ago[Security] Bump bootstrap from 3.4.1 to 4.3.1
dependabot[bot] [Sat, 23 Feb 2019 02:13:57 +0000 (02:13 +0000)]
[Security] Bump bootstrap from 3.4.1 to 4.3.1

Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.4.1 to 4.3.1. **This update includes security fixes.**
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v3.4.1...v4.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
5 years agoMerge pull request #14568 from nextcloud/techdebt/noid/cleanup-code-leftovers
Roeland Jago Douma [Wed, 6 Mar 2019 20:08:46 +0000 (21:08 +0100)]
Merge pull request #14568 from nextcloud/techdebt/noid/cleanup-code-leftovers

Cleanup some PHPDoc leftovers and unused variables

5 years agoMerge pull request #14569 from nextcloud/fix/noid/fix-transifex
Morris Jobke [Wed, 6 Mar 2019 15:59:09 +0000 (16:59 +0100)]
Merge pull request #14569 from nextcloud/fix/noid/fix-transifex

Fix transifex sync for files_sharing

5 years agoCleanup some PHPDoc leftovers and unused variables 14568/head
Morris Jobke [Wed, 6 Mar 2019 13:51:17 +0000 (14:51 +0100)]
Cleanup some PHPDoc leftovers and unused variables

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14424 from nextcloud/fix/13554/swift_to_tmp
Roeland Jago Douma [Wed, 6 Mar 2019 14:33:15 +0000 (15:33 +0100)]
Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmp

Use a tmp file for swift writes

5 years agoMerge pull request #14563 from nextcloud/fix/jquery-version
Morris Jobke [Wed, 6 Mar 2019 14:32:48 +0000 (15:32 +0100)]
Merge pull request #14563 from nextcloud/fix/jquery-version

Pin the jquery version to 2.1.4

5 years agoMerge pull request #14561 from Nutomic/wrong-username-message
Morris Jobke [Wed, 6 Mar 2019 14:26:12 +0000 (15:26 +0100)]
Merge pull request #14561 from Nutomic/wrong-username-message

Change login error message to "wrong username or password"

5 years agoAvoid calculating folder size for parent that needs scan. 14425/head
Ari Selseng [Fri, 1 Mar 2019 22:52:58 +0000 (23:52 +0100)]
Avoid calculating folder size for parent that needs scan.

Signed-off-by: Ari Selseng <ari@selseng.net>
5 years agoFix transifex sync for files_sharing 14569/head
Morris Jobke [Wed, 6 Mar 2019 14:02:07 +0000 (15:02 +0100)]
Fix transifex sync for files_sharing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14567 from nextcloud/fix/noid/transifex-excludes
Morris Jobke [Wed, 6 Mar 2019 13:42:48 +0000 (14:42 +0100)]
Merge pull request #14567 from nextcloud/fix/noid/transifex-excludes

Update generated webpack files to .l10nignore

5 years agoUpdate generated webpack files to .l10nignore 14567/head
Morris Jobke [Wed, 6 Mar 2019 12:54:04 +0000 (13:54 +0100)]
Update generated webpack files to .l10nignore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14560 from nextcloud/tests/noid/fully-check-compliant-apps
Morris Jobke [Wed, 6 Mar 2019 13:00:10 +0000 (14:00 +0100)]
Merge pull request #14560 from nextcloud/tests/noid/fully-check-compliant-apps

Fully check compliant apps

5 years agoPin the jquery version to 2.1.4 14563/head
Christoph Wurst [Wed, 6 Mar 2019 11:22:49 +0000 (12:22 +0100)]
Pin the jquery version to 2.1.4

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
5 years agoChange login error message to "wrong username or password" (fixes #14460) 14561/head
Felix Ableitner [Wed, 6 Mar 2019 10:56:21 +0000 (11:56 +0100)]
Change login error message to "wrong username or password" (fixes #14460)

Signed-off-by: Felix Ableitner <me@nutomic.com>
5 years agoMerge pull request #14558 from nextcloud/fix/13790/fix-comment
Morris Jobke [Wed, 6 Mar 2019 10:42:14 +0000 (11:42 +0100)]
Merge pull request #14558 from nextcloud/fix/13790/fix-comment

Fix unnecessary boolean cast

5 years ago"Fix" the unit tests 14548/head
Joas Schilling [Wed, 6 Mar 2019 10:06:03 +0000 (11:06 +0100)]
"Fix" the unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMerge pull request #13327 from nextcloud/allow-bracket-notation-for-remove-ipv6-address
Morris Jobke [Wed, 6 Mar 2019 09:34:02 +0000 (10:34 +0100)]
Merge pull request #13327 from nextcloud/allow-bracket-notation-for-remove-ipv6-address

Allow bracket IPv6 address format inside IPAdress Normalizer

5 years agoMerge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa
Morris Jobke [Wed, 6 Mar 2019 09:16:58 +0000 (10:16 +0100)]
Merge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa

Clear backupcode reminder when no 2fa

5 years agoFix unnecessary boolean cast 14558/head
Morris Jobke [Wed, 6 Mar 2019 09:12:58 +0000 (10:12 +0100)]
Fix unnecessary boolean cast

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #13790 from fretn/master
Morris Jobke [Wed, 6 Mar 2019 09:12:14 +0000 (10:12 +0100)]
Merge pull request #13790 from fretn/master

Fix for crashing occ files:scan

5 years agoremove unused use statement 14464/head
Arthur Schiwon [Tue, 5 Mar 2019 23:34:29 +0000 (00:34 +0100)]
remove unused use statement

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoadd missing config bits to integration tests
Arthur Schiwon [Tue, 5 Mar 2019 23:09:23 +0000 (00:09 +0100)]
add missing config bits to integration tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agowith LDAP server set offline, config cannot be controlled via ocs anymore
Arthur Schiwon [Tue, 5 Mar 2019 11:53:13 +0000 (12:53 +0100)]
with LDAP server set offline, config cannot be controlled via ocs anymore

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoMerge pull request #14541 from nextcloud/ci/noid/disable-fragile-tests
Morris Jobke [Tue, 5 Mar 2019 21:31:38 +0000 (22:31 +0100)]
Merge pull request #14541 from nextcloud/ci/noid/disable-fragile-tests

Disable fragile tests for now

5 years agoDo not send notification if no active 2fa 14553/head
Roeland Jago Douma [Tue, 5 Mar 2019 19:21:37 +0000 (20:21 +0100)]
Do not send notification if no active 2fa

If the job is still present we should also not fire it off if there is
not a single active 2FA provider.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoClear backupcodes reminder if no 2FA is enabled
Roeland Jago Douma [Tue, 5 Mar 2019 19:14:16 +0000 (20:14 +0100)]
Clear backupcodes reminder if no 2FA is enabled

Fixes #14125

Listen to 2FA disable event. If a provider is disabled for a user. We
check if there are no more providers. If there are no more providers we
Remove the backupcode reminder notification (if still present).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoMerge pull request #14535 from nextcloud/tests/noid/reduce-logs-in-checker-test
Roeland Jago Douma [Tue, 5 Mar 2019 18:53:26 +0000 (19:53 +0100)]
Merge pull request #14535 from nextcloud/tests/noid/reduce-logs-in-checker-test

Reduce errors in checker tests

5 years agoMerge pull request #14175 from skydiablo/master
Morris Jobke [Tue, 5 Mar 2019 17:59:45 +0000 (18:59 +0100)]
Merge pull request #14175 from skydiablo/master

Fix ObjectStorage expired token (v3)

5 years agoMake the file strict
Joas Schilling [Tue, 5 Mar 2019 17:00:46 +0000 (18:00 +0100)]
Make the file strict

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoAvoid duplicate App container creation
Joas Schilling [Tue, 5 Mar 2019 16:55:35 +0000 (17:55 +0100)]
Avoid duplicate App container creation

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMerge pull request #14373 from nextcloud/ci/noid/add-bundle-test
Morris Jobke [Tue, 5 Mar 2019 16:14:01 +0000 (17:14 +0100)]
Merge pull request #14373 from nextcloud/ci/noid/add-bundle-test

Add test for updated CA bundle

5 years agoMerge pull request #14544 from nextcloud/fix/admin-2fa-settings-leftover
Morris Jobke [Tue, 5 Mar 2019 15:25:39 +0000 (16:25 +0100)]
Merge pull request #14544 from nextcloud/fix/admin-2fa-settings-leftover

Remove leftover input that causes undefined index errors

5 years agoUse proper dependency injection for app manager
Morris Jobke [Tue, 5 Mar 2019 15:00:47 +0000 (16:00 +0100)]
Use proper dependency injection for app manager

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoFix whitespace
Morris Jobke [Tue, 5 Mar 2019 14:48:50 +0000 (15:48 +0100)]
Fix whitespace

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoSuppress phan exceptions because they are catched by a class_exists
Morris Jobke [Tue, 5 Mar 2019 14:46:56 +0000 (15:46 +0100)]
Suppress phan exceptions because they are catched by a class_exists

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work. 14373/head 14539/head
Daniel Kesselberg [Tue, 5 Mar 2019 14:20:47 +0000 (15:20 +0100)]
DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoAdd test for updated CA bundle
Morris Jobke [Mon, 25 Feb 2019 12:49:03 +0000 (13:49 +0100)]
Add test for updated CA bundle

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoRemove leftover input that causes undefined index errors 14544/head
Christoph Wurst [Tue, 5 Mar 2019 13:53:39 +0000 (14:53 +0100)]
Remove leftover input that causes undefined index errors

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
5 years agoMerge pull request #14451 from nextcloud/bugfix/noid/error-message-on-password-change
Morris Jobke [Tue, 5 Mar 2019 13:27:22 +0000 (14:27 +0100)]
Merge pull request #14451 from nextcloud/bugfix/noid/error-message-on-password-change

Check if password can be changed for the users backend in OCS api

5 years agoDisable fragile tests for now 14541/head
Morris Jobke [Tue, 5 Mar 2019 13:23:08 +0000 (14:23 +0100)]
Disable fragile tests for now

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoFully check compliant apps 14560/head
Morris Jobke [Tue, 5 Mar 2019 13:06:38 +0000 (14:06 +0100)]
Fully check compliant apps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoReduce errors in checker tests by creating the data dir 14535/head
Morris Jobke [Tue, 5 Mar 2019 10:39:59 +0000 (11:39 +0100)]
Reduce errors in checker tests by creating the data dir

* only created if it doesn't exist yet

Signed-off-by: Morris Jobke <hey@morrisjobke.de>