summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-03-14612-6256/+7154
|
* Merge pull request #14679 from nextcloud/fix/noid/l10n-accessibiltiyMorris Jobke2019-03-143-1/+5
|\ | | | | Fix translation sync for accessibiltiy
| * Add time between SMB test runs and properly log full changesetMorris Jobke2019-03-141-1/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix translation sync for accessibiltiyMorris Jobke2019-03-142-0/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #14683 from nextcloud/postgres-cast-stringMorris Jobke2019-03-141-5/+7
|\ \ | | | | | | add casting to string for postgresql query builder
| * | add casting to string for postgresql query builderRobin Appelman2019-03-141-5/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #14668 from nextcloud/fix/noid/make-appstore-test-more-stableMorris Jobke2019-03-141-3/+8
|\ \ \ | |/ / |/| | Make appstore app:enable test more robust by repeating if it fails on the first try
| * | Make appstore app:enable test more robust by using only shipped appsMorris Jobke2019-03-141-3/+8
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #14652 from nextcloud/fix/invalid_usernamesJoas Schilling2019-03-141-0/+14
|\ \ \ | |_|/ |/| | Do not allow invalid users to be created
| * | Do not allow invalid users to be createdRoeland Jago Douma2019-03-141-0/+14
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12119 from nextcloud/add_circle_to_caldav_and_filepanel-15Morris Jobke2019-03-147-11/+77
|\ \ | | | | | | Add Circle to Caldav and Filepanel
| * | Improve codeMorris Jobke2019-03-131-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Use dependency injection for app managerMorris Jobke2019-03-134-5/+25
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Created infrastructure to show circles' shared filesVinicius Cubas Brand2019-03-134-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it. Issue: https://github.com/nextcloud/circles/issues/137 Changes to comply to https://github.com/coletivoEITA/circles/pull/2 Polishing: get files shared to circles in caldav Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com> Signed-off-by: Maxence Lange <maxence@artificial-owl.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #14670 from nextcloud/bugfix/noid/theming-css-varsJulius Härtl2019-03-141-3/+3
|\ \ \ | | | | | | | | Use SCSS variables since CSS vars are not loaded on public pages
| * | | Use SCSS variables since CSS vars are not loaded on public pagesJulius Härtl2019-03-131-3/+3
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #14663 from nextcloud/remove_userExternal_exampleRoeland Jago Douma2019-03-131-12/+0
|\ \ \ | |_|/ |/| | remove user_external example from config.sample.php
| * | 👌 IMPROVE: remove user_external example from config.sample.phpJonas Sulzer2019-03-131-12/+0
| | | | | | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-testsMorris Jobke2019-03-139-263/+272
|\ \ \ | | | | | | | | Disable fragile tests
| * | | Wait up to 10 seconds for incoming changes from SMB notifierMorris Jobke2019-03-131-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Disable fragile user acceptance testsMorris Jobke2019-03-131-18/+18
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Disable failing login testMorris Jobke2019-03-131-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | | Disable failing comments testMorris Jobke2019-03-131-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Disable failing files app testMorris Jobke2019-03-131-114/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Disable failing apps management testMorris Jobke2019-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Disable failing files tag testMorris Jobke2019-03-131-76/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Disable failing federated sharing testsMorris Jobke2019-03-131-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Do not run fragile TrashbinTestMorris Jobke2019-03-131-2/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #14656 from nextcloud/trash-prevent-recursionMorris Jobke2019-03-131-1/+4
|\ \ \ | | | | | | | | prevent recursion when moving a file to the trashbin
| * | | prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #14644 from nextcloud/fix/noid/remove-sensitive-smb-valuesRoeland Jago Douma2019-03-131-0/+6
|\ \ \ | |/ / |/| | Remove sensitive SMB arguments from exception log
| * | Remove sensitive SMB arguments from exception logMorris Jobke2019-03-121-0/+6
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldavMorris Jobke2019-03-1314-8/+114
|\ \ \ | |/ / |/| | Change CALDAV to allow calendars be shared with circles.
| * | Fix PHPUnitMorris Jobke2019-03-121-0/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix PHPUnitMorris Jobke2019-03-121-0/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Use proper dependency injection for app managerMorris Jobke2019-03-058-7/+26
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix whitespaceMorris Jobke2019-03-051-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Suppress phan exceptions because they are catched by a class_existsMorris Jobke2019-03-051-0/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | use class_exists on correct class to please phanGeorg Ehrke2019-03-041-2/+2
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | properly catch exceptions of detailsCircleGeorg Ehrke2019-03-031-1/+9
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Get user's circles without touching sessionVinicius Cubas Brand2019-03-011-6/+1
| | | | | | | | | | | | | | | | | | This works with nextcloud/circles#260 Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * | allow sharing addressbooks with circlesGeorg Ehrke2019-03-012-3/+4
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Share calendar to circleVinicius Cubas Brand2019-03-014-2/+78
| | | | | | | | | | | | | | | | | | | | | * Allow user to share calendar with a circle * Allow user to see calendars shared with his/her circles Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | Merge pull request #14626 from ↵Morris Jobke2019-03-123-91/+34
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/14621/make-sure-urlparams-are-correctly-injected-in-global-routes Make sure urlparams are correctly injected in global routes
| * | | Add a message about disabled global routesJoas Schilling2019-03-111-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make sure urlParams are correctly injected in global routesJoas Schilling2019-03-112-91/+26
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14586 from nextcloud/hint-user-docs-federationMorris Jobke2019-03-112-0/+7
|\ \ \ | | | | | | | | Add hint to user documentation (Federation)
| * | | Fix display of i in personal settingsMorris Jobke2019-03-111-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add hint to user documentation (Federation)Marius Blüm2019-03-111-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | Merge pull request #14623 from nextcloud/fix/noid/login-page-wrong-passwordMorris Jobke2019-03-111-1/+1
|\ \ \ \ | |/ / / |/| | | Fix acceptance tests for wrong password message due to changed message
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 20:38:37 +0000