Commit Graph

50510 Commits

Author SHA1 Message Date
Julius Härtl 64fe9bc287
Return the proper jailed path when requesting the root path
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-09-04 13:25:17 +02:00
Robin Appelman 9bf8ee701f
Update apps/files_trashbin/lib/Trashbin.php
Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
2019-09-04 13:06:07 +02:00
Roeland Jago Douma 0e19e55e24
Merge pull request #16835 from nextcloud/bugfix/16833/remove-orphan-event-data-from-subscriptions
Remove orphaned calendar data from deleted subscriptions
2019-09-04 10:54:47 +02:00
Roeland Jago Douma ca0fbaca8c
Merge pull request #16882 from nextcloud/enh/apppassword_rotation
Allow rotation of apppasswords
2019-09-04 10:49:10 +02:00
Roeland Jago Douma 560b9851e5
Merge pull request #16231 from nextcloud/enhancement/noid/nodeinfo
+nodeinfo public service
2019-09-04 10:36:49 +02:00
Roeland Jago Douma 2fdf946dae
Merge pull request #16454 from nextcloud/bugfix/noid/sharelink-shouldnt-open-menu-automatically
Dont show menu automatically when share link is clicked
2019-09-04 10:36:04 +02:00
Roeland Jago Douma 4be862f7d7
Merge pull request #16951 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-0.12.2
Bump nextcloud-vue from 0.12.1 to 0.12.2
2019-09-04 10:25:42 +02:00
Joas Schilling 70807a74c7
Correctly check for new default root
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-04 09:28:58 +02:00
Roeland Jago Douma 361ff3127e
Merge pull request #16932 from nextcloud/fix/workflow/jails
Be sure to get the jailed path if the storage is a jail
2019-09-04 08:55:47 +02:00
Roeland Jago Douma 739e25e1db
Merge pull request #16980 from nextcloud/bugfix/16878/change_button_label
Change the save credentials button label
2019-09-04 08:54:51 +02:00
Roeland Jago Douma ab2a8bacf1
Merge pull request #16975 from nextcloud/build/noid/makefile-clean-git
Add clean-git target to makefile
2019-09-04 08:09:21 +02:00
Roeland Jago Douma b7301f40dd
Merge pull request #16972 from nextcloud/enh/default_client_timeout
Set a default request timeout
2019-09-04 08:08:48 +02:00
Roeland Jago Douma 102b1e170c
Merge pull request #16990 from nextcloud/ci/do_not_run_every_db_combo_on_prs
Do not run every possible DB combo on PRs
2019-09-04 08:08:02 +02:00
Roeland Jago Douma de571bd963
Merge pull request #16982 from nextcloud/enh/only_run_codecov_on_merge
Only run code coverage CI on merge
2019-09-04 08:06:33 +02:00
Roeland Jago Douma 3776f7e0cb
Merge pull request #16981 from nextcloud/fix/timeout/300
No need to wait 10 minutes for the DB to get up.
2019-09-04 08:06:02 +02:00
Nextcloud bot b3292b6552
[tx-robot] updated from transifex 2019-09-04 02:16:15 +00:00
Roeland Jago Douma f4ab4431ab
Do not run every possible DB combo on PRs
Only run them once merged.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-03 20:15:52 +02:00
Julius Härtl 64c63bb00b
Properly initialize the CacheJail for sharing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-09-03 18:07:59 +02:00
Roeland Jago Douma 16477c181e
Only run code coverage CI on merge
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-03 18:07:28 +02:00
Julius Härtl f12a99e5e2
Warn user before closing when uploading a file on a upload only link
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-09-03 16:35:34 +02:00
Roeland Jago Douma 60c7ef7f5e
No need to wait 10 minutes for the DB to get up.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-03 15:38:52 +02:00
Greta Doci fc83ca7409 Change the save credentials button label and the mail_settings input class
Signed-off-by: Greta Doci <gretadoci@gmail.com>
2019-09-03 15:25:17 +02:00
Daniel Kesselberg 773778dd8c
Add default timeout to expected request options
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-09-03 14:59:09 +02:00
dependabot-preview[bot] 332bdb205b Bump nextcloud-vue from 0.12.1 to 0.12.2
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>
2019-09-03 08:53:42 +00:00
Julius Härtl 63626f593e
Add clean-git target to makefile
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-09-03 10:13:28 +02:00
Roeland Jago Douma f57fa231f7
Be sure to get the jailed path if the storage is a jail
Fixes: https://github.com/nextcloud/groupfolders/issues/583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-03 09:57:09 +02:00
Roeland Jago Douma ecd0d39c30
Merge pull request #16928 from nextcloud/fix/icontrolelrmethodreflector
Remove reflect method form public interface
2019-09-03 07:53:36 +02:00
Roeland Jago Douma 6093acd4f0
Merge pull request #16969 from nextcloud/bugfix/14350/thumbnail_should_open_thefile_not_sidebar
When you click on thumbnail of a file, it should open the file not the sidebar
2019-09-03 07:52:34 +02:00
Roeland Jago Douma 6188734579
Merge pull request #16964 from phpbg/master
Fix sanity checks #16963
2019-09-03 07:50:11 +02:00
Roeland Jago Douma d22ab5e7a9
Merge pull request #16955 from nextcloud/dependabot/npm_and_yarn/webpack-4.39.3
Bump webpack from 4.39.2 to 4.39.3
2019-09-03 07:49:20 +02:00
Nextcloud bot 0d1df80fbf
[tx-robot] updated from transifex 2019-09-03 02:15:06 +00:00
Roeland Jago Douma 80d272c311
Merge pull request #16968 from nextcloud/feature/noid/guest-mention-notifications-for-talk
Define a guest type so Talk can use it in it's notifications
2019-09-02 20:14:38 +02:00
dependabot-preview[bot] 6e6fbc6783 Bump webpack from 4.39.2 to 4.39.3
Bumps [webpack](https://github.com/webpack/webpack) from 4.39.2 to 4.39.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.39.2...v4.39.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-02 14:24:00 +00:00
Roeland Jago Douma 847b76c16e
Merge pull request #16930 from nextcloud/npm/audit/build
Fix npm audit warning in build
2019-09-02 15:49:20 +02:00
Roeland Jago Douma ca2623e6ad
Set a default request timeout
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>
2019-09-02 15:42:48 +02:00
Georg Ehrke 88f6d1c20e
Make push notifications for calendar reminders opt-in
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-09-02 15:18:43 +02:00
Greta Doci ac2c1ddd4e Change filelist _onClickFile function so thumbnail to open the file instead of the sidebar
Signed-off-by: Greta Doci <gretadoci@gmail.com>
2019-09-02 15:11:52 +02:00
Joas Schilling 60fe0d7fc4
Define a guest type so Talk can use it in it's notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-02 14:56:50 +02:00
Roeland Jago Douma daf89e6b34
Merge pull request #16950 from nextcloud/dependabot/npm_and_yarn/vue-router-3.1.3
Bump vue-router from 3.1.2 to 3.1.3
2019-09-02 12:07:31 +02:00
Daniel Kesselberg 62ded4ad50
Kill repair step for cypress tests
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-09-02 11:50:23 +02:00
Roeland Jago Douma 679a694e6f
Merge pull request #16961 from nextcloud/fix/settings/js_error
Fix JS error on personal security page
2019-09-02 09:21:12 +02:00
dependabot-preview[bot] 4d9d7f7ee8 Bump vue-router from 3.1.2 to 3.1.3
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.1.2...v3.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-02 06:20:05 +00:00
Roeland Jago Douma 7065bcafc7
Merge pull request #16954 from nextcloud/dependabot/npm_and_yarn/nextcloud-password-confirmation-0.4.2
Bump nextcloud-password-confirmation from 0.4.1 to 0.4.2
2019-09-02 08:19:10 +02:00
Nextcloud bot 16562a3649
[tx-robot] updated from transifex 2019-09-02 02:15:12 +00:00
Samuel CHEMLA 94eb77a535 Fix sanity checks #16963
Signed-off-by: Samuel CHEMLA <chemla.samuel@gmail.com>
2019-09-01 22:27:08 +02:00
Daniel Kesselberg 2d04be27df
Keep cypress if git
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-09-01 20:46:13 +02:00
Roeland Jago Douma 503b9c63c3
Merge pull request #16953 from nextcloud/dependabot/npm_and_yarn/blueimp-md5-2.12.0
Bump blueimp-md5 from 2.11.1 to 2.12.0
2019-09-01 20:22:35 +02:00
Roeland Jago Douma 055261e79d
Fix JS error on personal security page
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-01 19:37:43 +02:00
dependabot-preview[bot] 8135df583b
Bump nextcloud-password-confirmation from 0.4.1 to 0.4.2
Bumps [nextcloud-password-confirmation](https://github.com/ChristophWurst/nextcloud-password-confirmation) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/ChristophWurst/nextcloud-password-confirmation/releases)
- [Commits](https://github.com/ChristophWurst/nextcloud-password-confirmation/compare/v0.4.1...v0.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-01 17:34:35 +00:00
Roeland Jago Douma 4d696bc4bc
Merge pull request #16952 from nextcloud/dependabot/npm_and_yarn/webpack-merge-4.2.2
Bump webpack-merge from 4.2.1 to 4.2.2
2019-09-01 19:33:40 +02:00