summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-09-0714-74/+76
|
* Merge pull request #16664 from nextcloud/bugfix/emit-moveToTrash-limitblizzz2019-09-062-8/+16
|\ | | | | Emit moveToTrash event only for the deleting user
| * Use the owner from the storageRoeland Jago Douma2019-08-071-3/+9
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Emit moveToTrash event only for the deleting userJulius Härtl2019-08-062-9/+11
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #16984 from nextcloud/bugfix/noid/warn-during-upload-dropRoeland Jago Douma2019-09-061-11/+30
|\ \ | | | | | | Warn user before closing when uploading a file on a upload only link
| * | Warn user before closing when uploading a file on a upload only linkJulius Härtl2019-09-031-11/+30
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2019-09-0648-80/+142
| | |
* | | Merge pull request #17011 from nextcloud/version/we-are-18Roeland Jago Douma2019-09-0525-51/+51
|\ \ \ | | | | | | | | Development is 18 now!
| * | | Development is 18 now!Roeland Jago Douma2019-09-0525-51/+51
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17008 from nextcloud/enh/nodbtests_log/filetestRoeland Jago Douma2019-09-051-2/+0
|\ \ \ | | | | | | | | Log/FileTest does not require the DB
| * | | Log/FileTest does not require the DBRoeland Jago Douma2019-09-041-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #17009 from nextcloud/enh/drone_integration_parallel_composerRoeland Jago Douma2019-09-051-33/+33
|\ \ \ \ | | | | | | | | | | Download composer packages in parallel in integration tests
| * | | | Download composer packages in parallel in integration testsRoeland Jago Douma2019-09-041-33/+33
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16919 from nextcloud/version/17.0.0/beta4v17.0.0beta4Roeland Jago Douma2019-09-051-2/+2
|\ \ \ \ | | | | | | | | | | 17 Beta 4
| * | | | 17 Beta 4Roeland Jago Douma2019-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-05140-194/+236
|/ / / /
* | | | Merge pull request #17007 from nextcloud/enh/nodbtestsRoeland Jago Douma2019-09-041-1/+0
|\ \ \ \ | | | | | | | | | | CapabilitiesTests are not DB tests
| * | | | CapabilitiesTests are not DB testsRoeland Jago Douma2019-09-041-1/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16999 from nextcloud/bugfix/noid/getJailedPath-rootRoeland Jago Douma2019-09-041-1/+1
|\ \ \ \ | |/ / / |/| | | Return the proper jailed path when requesting the root path
| * | | Return the proper jailed path when requesting the root pathJulius Härtl2019-09-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #16970 from ↵Roeland Jago Douma2019-09-045-0/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/opt_in_for_push_notifications_calendar_reminders Make push notifications for calendar reminders opt-in
| * | | | Make push notifications for calendar reminders opt-inGeorg Ehrke2019-09-025-0/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #16534 from nextcloud/trash-copy-free-spaceRoeland Jago Douma2019-09-041-1/+6
|\ \ \ \ \ | | | | | | | | | | | | dont try to copy trash items to user if the user has not enough free space
| * | | | | Update apps/files_trashbin/lib/Trashbin.phpRobin Appelman2019-09-041-1/+3
| | | | | | | | | | | | | | | | | | Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
| * | | | | dont try to copy trash items to user if the user has not enough free spaceRobin Appelman2019-07-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #16835 from ↵Roeland Jago Douma2019-09-041-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/16833/remove-orphan-event-data-from-subscriptions Remove orphaned calendar data from deleted subscriptions
| * | | | | | Check the calendar type of calendarobjects & calendarchangesThomas Citharel2019-08-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | | Remove orphaned calendar data from deleted subscriptionsThomas Citharel2019-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #16833. Ref #13511 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | | Merge pull request #16882 from nextcloud/enh/apppassword_rotationRoeland Jago Douma2019-09-042-0/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow rotation of apppasswords
| * | | | | | | Allow rotation of apppasswordsRoeland Jago Douma2019-08-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #16231 from nextcloud/enhancement/noid/nodeinfoRoeland Jago Douma2019-09-044-4/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | +nodeinfo public service
| * | | | | | | | testing processMaxence Lange2019-08-293-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | | | | +nodeinfo public serviceMaxence Lange2019-08-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | | | | | Merge pull request #16454 from ↵Roeland Jago Douma2019-09-044-15/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/sharelink-shouldnt-open-menu-automatically Dont show menu automatically when share link is clicked
| * | | | | | | | | Adjust acceptance tests to changes in link share menu behaviourGreta Doci2019-08-291-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the link share menu is not automatically opened after a link share is created, so waiting until it was opened failed in iShareTheLinkFor. Note that the steps that interact with the link share menu take care themselves of showing the menu if needed, so there is no need to explicitly show it despite the change. Also, the waiting in iShareTheLinkFor was introduced when the link share menu was changed to automatically open after creating a link share, as that caused some issues with the steps that opened the menu by themselves (fec8d12fc5). Due to all this, now that the link share menu is again not automatically opened the wait can be simply removed. Signed-off-by: Greta Doci <gretadoci@gmail.com>
| * | | | | | | | | Dont show menu automatically when share link is clickedGreta Doci2019-08-293-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | | | | | | | | Merge pull request #16951 from ↵Roeland Jago Douma2019-09-0416-248/+248
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud-vue-0.12.2 Bump nextcloud-vue from 0.12.1 to 0.12.2
| * | | | | | | | | Bump nextcloud-vue from 0.12.1 to 0.12.2dependabot-preview[bot]2019-09-0316-248/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [nextcloud-vue](https://github.com/nextcloud/nextcloud-vue) from 0.12.1 to 0.12.2. - [Release notes](https://github.com/nextcloud/nextcloud-vue/releases) - [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v0.12.1...v0.12.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | | | Merge pull request #16932 from nextcloud/fix/workflow/jailsRoeland Jago Douma2019-09-041-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Be sure to get the jailed path if the storage is a jail
| * | | | | | | | | | Be sure to get the jailed path if the storage is a jailRoeland Jago Douma2019-09-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/nextcloud/groupfolders/issues/583 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | | Merge pull request #16980 from nextcloud/bugfix/16878/change_button_labelRoeland Jago Douma2019-09-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change the save credentials button label
| * | | | | | | | | | | Change the save credentials button label and the mail_settings input classGreta Doci2019-09-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | | | | | | | | | | Merge pull request #16975 from nextcloud/build/noid/makefile-clean-gitRoeland Jago Douma2019-09-041-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add clean-git target to makefile
| * | | | | | | | | | | | Add clean-git target to makefileJulius Härtl2019-09-031-4/+16
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | | | | | Merge pull request #16972 from nextcloud/enh/default_client_timeoutRoeland Jago Douma2019-09-042-34/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Set a default request timeout
| * | | | | | | | | | | | Add default timeout to expected request optionsDaniel Kesselberg2019-09-031-34/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | | | | | | Set a default request timeoutRoeland Jago Douma2019-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This to avoid endless running processes. A default timeout of 30 seconds should cover the 99% case. If a job need specific longer time it should set that. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | | | | Merge pull request #16990 from nextcloud/ci/do_not_run_every_db_combo_on_prsRoeland Jago Douma2019-09-041-20/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not run every possible DB combo on PRs
| * | | | | | | | | | | | | Do not run every possible DB combo on PRsRoeland Jago Douma2019-09-031-20/+9
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only run them once merged. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | | | | Merge pull request #16982 from nextcloud/enh/only_run_codecov_on_mergeRoeland Jago Douma2019-09-041-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only run code coverage CI on merge