Morris Jobke
0c2f016b67
Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_better
...
Make the token expiration also work for autocasting 0
2018-06-09 11:25:58 +02:00
Nextcloud bot
ae3bdb4fb9
[tx-robot] updated from transifex
2018-06-09 00:13:06 +00:00
John Molakvoæ
fd1498a171
Merge pull request #9793 from nextcloud/fix-mention-regex
...
Fix mentions regex
2018-06-08 18:02:46 +02:00
Mario Danic
d959ca8eb0
Add another test
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 17:21:46 +02:00
Mario Danic
5acdd45b77
Add a new regex test
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 17:15:41 +02:00
Roeland Jago Douma
480864b3e3
Make the token expiration also work for autocasting 0
...
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:20:43 +02:00
John Molakvoæ
8d26f9cd6d
Merge pull request #9796 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.12.0
...
Bump webpack from 4.11.1 to 4.12.0 in /apps/updatenotification
2018-06-08 11:54:45 +02:00
John Molakvoæ
aefc680e61
Merge pull request #9797 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.12.0
...
Bump webpack from 4.11.1 to 4.12.0 in /settings
2018-06-08 11:54:27 +02:00
dependabot[bot]
0c297d4943
Bump webpack from 4.11.1 to 4.12.0 in /settings
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.11.1...v4.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-08 09:11:39 +00:00
dependabot[bot]
6e676ee62d
Bump webpack from 4.11.1 to 4.12.0 in /apps/updatenotification
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.11.1...v4.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-08 09:11:24 +00:00
Mario Danic
47769d2640
New regex to match mentions
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 10:21:19 +02:00
Morris Jobke
bbfc028169
Merge pull request #9786 from nextcloud/feature/noid/external_sftp_password_and_key
...
Add SFTP auth mechanism to use a password and private key for SFTP
2018-06-08 09:23:47 +02:00
Nextcloud bot
b34111bfc9
[tx-robot] updated from transifex
2018-06-08 00:12:51 +00:00
Mario Danic
dc7beda308
Remove unsupported modifier
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 00:59:31 +02:00
Mario Danic
6bf8fca574
Fix mentions regex
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 00:35:51 +02:00
Morris Jobke
be30c09e9e
Merge pull request #9787 from nextcloud/notify-credentials-env
...
allow setting notify credentials in environment
2018-06-07 16:13:10 +02:00
Morris Jobke
c60c8ac675
Merge pull request #9772 from nextcloud/feature/8123/same_site_cookie_config_php
...
Move samesite cookie opt-out to config.php
2018-06-07 15:36:33 +02:00
Robin Appelman
48fb126505
allow setting notify credentials in environment
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-07 15:33:58 +02:00
Morris Jobke
43edffa93c
Merge pull request #9783 from nextcloud/3rdparty/noid/kill_cssmin
...
[3rdparty] Kill CssMin
2018-06-07 15:17:21 +02:00
Roeland Jago Douma
776641025a
[3rdparty] Kill CssMin
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-07 14:42:25 +02:00
John Molakvoæ
44c6d22b22
Merge pull request #9616 from nextcloud/zero-quota-fix
...
Allow 0 quota by provisioning api
2018-06-07 13:54:44 +02:00
Roeland Jago Douma
2b19add6b0
Add SFTP auth mechanism to use a password and public key for SFTP
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-07 13:35:43 +02:00
John Molakvoæ
1ef32e0e59
Merge pull request #9775 from nextcloud/3rdparty/noid/bump_patchwork_utf8
...
[3rdparty] Bump patchwork/utf8
2018-06-07 12:44:43 +02:00
John Molakvoæ
444c2911d4
Merge pull request #9780 from nextcloud/bug/noid/mock_timefactory_theming
...
Mock the timefactory in the theming tests
2018-06-07 12:34:02 +02:00
Roeland Jago Douma
6f5c7c1888
Merge pull request #9777 from nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-3.0.3
...
Bump webpack-cli from 3.0.2 to 3.0.3 in /settings
2018-06-07 12:10:07 +02:00
Roeland Jago Douma
49145a78e9
Make sure initial files can be properly created
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-07 12:07:37 +02:00
Roeland Jago Douma
f65a6e782c
Mock the timefactory in the theming tests
...
Now that the cache logic is moved to the theming controller we must
properly overwrite this service. Else it could do 💥 in tests.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-07 11:42:21 +02:00
John Molakvoæ (skjnldsv)
da583f05fc
Allow 0 quota by provisioning api
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 11:30:37 +02:00
dependabot[bot]
2aea13ad05
Bump webpack-cli from 3.0.2 to 3.0.3 in /settings
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.0.2...v3.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-07 09:24:24 +00:00
Morris Jobke
132597bbd3
Merge pull request #9766 from nextcloud/vue-build-tests
...
Add vue apps build tests
2018-06-07 11:10:31 +02:00
Roeland Jago Douma
79867e1b68
[3rdparty] Bump patchwork/utf8
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-07 10:43:23 +02:00
John Molakvoæ (skjnldsv)
b5d2c1b031
Fix updatenotifications vars and groups request
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 10:08:56 +02:00
Morris Jobke
b24db1e491
Merge pull request #9762 from nextcloud/feature/noid/setupcheck-design
...
Add visual indicator for setup checks
2018-06-07 09:59:46 +02:00
John Molakvoæ (skjnldsv)
c5c18a483c
Makefile updatenotification fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 09:34:24 +02:00
John Molakvoæ (skjnldsv)
fd147cc3fd
Bump updatenotification
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 09:28:06 +02:00
John Molakvoæ
4972283803
Merge pull request #9747 from nextcloud/3rdparty/noid/bump_scss
...
Bump scssphp
2018-06-07 09:16:49 +02:00
John Molakvoæ (skjnldsv)
14cb805cf1
Bump settings config
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 08:35:02 +02:00
John Molakvoæ (skjnldsv)
62e29abc5b
Add vue apps build tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 08:35:02 +02:00
Roeland Jago Douma
4618f17654
Merge pull request #9676 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-template-compiler-2.5.16
...
Bump vue-template-compiler from 2.5.13 to 2.5.16 in /apps/updatenotification
2018-06-07 08:31:48 +02:00
Nextcloud bot
cc61c6ea15
[tx-robot] updated from transifex
2018-06-07 00:12:44 +00:00
John Molakvoæ
ad46af8558
Merge pull request #9771 from nextcloud/bugfix/noid/app-settings-missing-file
...
Missing svg filter mixin for apps management
2018-06-06 22:43:13 +02:00
Roeland Jago Douma
199fe0a347
Add warning
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-06 22:13:39 +02:00
jaltek
c79dc0e08f
Configurable list for opt out from same site cookie protection
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-06 22:13:35 +02:00
Roeland Jago Douma
e3652c8c12
Bump scssphp
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-06 21:30:16 +02:00
Roeland Jago Douma
ebdd3fb64a
Merge pull request #9768 from nextcloud/fix/noid/continue-button-on-public-page
...
Fix style of password button on protected link shares
2018-06-06 20:34:12 +02:00
Julius Härtl
e007e66a91
Add svg filter mixin
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-06 20:26:18 +02:00
Roeland Jago Douma
3fc1d60482
Merge pull request #9678 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-2.5.16
...
Bump vue from 2.5.13 to 2.5.16 in /apps/updatenotification
2018-06-06 19:51:39 +02:00
John Molakvoæ
59b086eae3
Merge pull request #9744 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/cross-env-5.1.6
...
Bump cross-env from 5.1.3 to 5.1.6 in /apps/updatenotification
2018-06-06 19:04:31 +02:00
Morris Jobke
c5a2510980
Fix style of password button on protected link shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-06 18:23:17 +02:00
Morris Jobke
b49f8e43bd
Merge pull request #9565 from nextcloud/feature/noid/app-settings
...
Migrate apps management to Vue.js
2018-06-06 18:05:04 +02:00