Roeland Jago Douma
3067dfe49e
Merge pull request #10149 from nextcloud/dependabot/npm_and_yarn/settings/babel-loader-7.1.5
...
Bump babel-loader from 7.1.4 to 7.1.5 in /settings
2018-07-09 10:51:17 +02:00
Morris Jobke
732394396b
Merge pull request #10135 from nextcloud/feature/noid/add-visio-mimetypes
...
Add visio mimetypes
2018-07-09 10:40:10 +02:00
Roeland Jago Douma
89bd037e07
Merge pull request #10144 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.0
...
Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2
2018-07-09 10:31:11 +02:00
Roeland Jago Douma
07e501a911
Merge pull request #10145 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.15.1
...
Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2
2018-07-09 10:29:44 +02:00
dependabot[bot]
b587aa5f79
Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 0.28.11 to 1.0.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-09 07:49:05 +00:00
dependabot[bot]
7a74483016
Bump babel-loader from 7.1.4 to 7.1.5 in /settings
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v7.1.4...v7.1.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-09 07:48:59 +00:00
Roeland Jago Douma
f0b356620f
Merge pull request #10147 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.0
...
Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibility
2018-07-09 09:46:42 +02:00
Roeland Jago Douma
5d75633814
Merge pull request #10146 from nextcloud/dependabot/npm_and_yarn/settings/css-loader-1.0.0
...
Bump css-loader from 0.28.11 to 1.0.0 in /settings
2018-07-09 09:46:16 +02:00
dependabot[bot]
6c7ff83a0c
Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibility
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 0.28.11 to 1.0.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-08 09:36:18 +00:00
dependabot[bot]
f346f96206
Bump css-loader from 0.28.11 to 1.0.0 in /settings
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 0.28.11 to 1.0.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v0.28.11...v1.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-08 09:36:10 +00:00
dependabot[bot]
1c8ba34655
Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.14.0 to 4.15.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.14.0...v4.15.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-08 09:36:05 +00:00
Joas Schilling
5541d3dd84
Add visio mimetypes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-06 15:16:21 +02:00
Morris Jobke
422c805e26
Merge pull request #10116 from nextcloud/lock-negative
...
prevent lock values from going negative with memcache backend
2018-07-06 14:50:18 +02:00
Roeland Jago Douma
3c9b12139e
Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12
...
[3rdparty] Bump symfony depts to 3.4.12
2018-07-06 14:06:42 +02:00
Roeland Jago Douma
8f12c9d85d
[3rdparty] Bump symfony depts to 3.4.12
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-06 13:18:10 +02:00
Joas Schilling
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
...
Upgrade to swiftmailer-6
2018-07-06 10:39:09 +02:00
Morris Jobke
8969e100a0
Merge pull request #10128 from nextcloud/fix/noid/add_locale_to_templates
...
Add locale to templates
2018-07-06 10:15:51 +02:00
Roeland Jago Douma
7b848368d5
Add locale to templates
...
It was already added to the user template but we should add it to all
templates. Else apps that want the locale but use special templating (hi
richdocuments!) will fail.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-06 09:23:01 +02:00
Roeland Jago Douma
de9ab49558
Merge pull request #10119 from nextcloud/bugfix/noid/fix-remnants-of-refactoring
...
Fix remnants of refactoring
2018-07-05 20:26:00 +02:00
Morris Jobke
a9b8fb090c
Fix remnants of refactoring
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 17:09:38 +02:00
Robin Appelman
3d5acbb1d0
prevent lock values from going negative with memcache backend
...
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-05 14:39:10 +02:00
Morris Jobke
cbfcfb236f
Merge pull request #9909 from nextcloud/feature/2192/allow_group_share_undeletion
...
Add API to undelete delete group shares
2018-07-05 13:31:58 +02:00
John Molakvoæ (skjnldsv)
f39dfc7ab8
Fixed jsunit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma
b49bc11fb3
Fix exception
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma
a1a845693b
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:57 +02:00
Morris Jobke
ced8789f5c
Fix PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
33f85f64c7
Always show menu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
d86c1e9503
Disable sidebar on deleted share
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
3b835d8076
Js magic for deleted shares
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma
d805959e81
Add API to undelete delete group shares
...
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.
This endpoint makes it possible to get back the share.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:56 +02:00
Morris Jobke
86d9528bc9
Merge pull request #10103 from nextcloud/bugfix/9767/apps-management-issues
...
Fix remaining apps management issues
2018-07-05 10:37:26 +02:00
Julius Härtl
1e1f164ff5
Update settings js
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 16:19:33 +02:00
Julius Härtl
ebeb2da3d3
Fix displaying errors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
Julius Härtl
96e65c677b
Hide uninstalled apps when removing them
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
Julius Härtl
2f332651d3
Add transition when enabling/disabling apps
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
Julius Härtl
ba13880147
Fix invalid limit parameter when fetching groups
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
blizzz
42912a0e25
Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-format
...
LDAP user should be able to set avatar if directory provides incompatible image
2018-07-04 14:37:21 +02:00
Morris Jobke
4051a23305
Merge pull request #10102 from nextcloud/bugfix/noid/fix-integration-tests-federation-2.0
...
Fix integration tests for Federation 2.0
2018-07-04 11:59:19 +02:00
Morris Jobke
021bd261bc
Fix integration tests for Federation 2.0
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-04 11:23:39 +02:00
Morris Jobke
16d5883680
Merge pull request #10101 from nextcloud/papercut/10094/oauth_table
...
Do not show OAuth2 table if it is empty
2018-07-04 11:22:56 +02:00
Roeland Jago Douma
6a0c54d5bf
Add warning to setup checks if the default mailer is still php
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
0cf0bcba61
Fix settings tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
be7db1573d
Swift to \Swift_Mailer as abstraction
...
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
0dd4a3e0cf
Kill php mail from settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
65bcef8fb3
[3rdparty] Bump swiftmailer 6.0.2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma
c92fe76f77
Merge pull request #10065 from nextcloud/rakekniven-patch-1
...
Update SettingsController.php
2018-07-04 08:26:27 +02:00
Roeland Jago Douma
ba08019429
Do not show OAuth2 table if it is empty
...
For #10094
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:23:21 +02:00
Morris Jobke
7025f16017
Merge pull request #9345 from nextcloud/federation20
...
Federation 2.0
2018-07-03 23:13:47 +02:00