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
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
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
3ade347b0d
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
...
Upgrade to swiftmailer-6
2018-07-06 10:39:09 +02:00
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
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
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
5d0fa12e12
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:44 +02:00
a9b8fb090c
Fix remnants of refactoring
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 17:09:38 +02:00
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
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
f39dfc7ab8
Fixed jsunit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
b49bc11fb3
Fix exception
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:57 +02:00
a1a845693b
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:57 +02:00
ced8789f5c
Fix PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-05 12:43:57 +02:00
33f85f64c7
Always show menu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
d86c1e9503
Disable sidebar on deleted share
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
3b835d8076
Js magic for deleted shares
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
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
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
1e1f164ff5
Update settings js
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 16:19:33 +02:00
ebeb2da3d3
Fix displaying errors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
96e65c677b
Hide uninstalled apps when removing them
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
2f332651d3
Add transition when enabling/disabling apps
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-04 15:40:51 +02:00
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
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
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
021bd261bc
Fix integration tests for Federation 2.0
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-04 11:23:39 +02:00
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
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
0cf0bcba61
Fix settings tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
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
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
0dd4a3e0cf
Kill php mail from settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
65bcef8fb3
[3rdparty] Bump swiftmailer 6.0.2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
c92fe76f77
Merge pull request #10065 from nextcloud/rakekniven-patch-1
...
Update SettingsController.php
2018-07-04 08:26:27 +02:00
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
7025f16017
Merge pull request #9345 from nextcloud/federation20
...
Federation 2.0
2018-07-03 23:13:47 +02:00
8b683feca2
Merge pull request #10088 from nextcloud/bugfix/noid/rebuild-navigation-first
...
Properly insert app icons into navigation
2018-07-03 20:09:29 +02:00
df84c3c421
Merge pull request #10090 from nextcloud/smb-log-connection-errors
...
Improved logging of smb connection errors
2018-07-03 17:55:46 +02:00
e97191e1de
Merge pull request #10092 from nextcloud/revert/10080/undeclared-phan-warning
...
Revert "Fix undeclared method warning in phan"
2018-07-03 17:55:24 +02:00
10b8a4a8b1
Revert "Fix undeclared method warning in phan"
...
This reverts commit f3093b2401
2018-07-03 17:46:11 +02:00
27089422e1
Improved logging of smb connection errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-03 14:56:37 +02:00
7b87e00db1
Properly insert app icons into navigation
...
If the app menu is rebuild with the first icon being updated, the whole
list was empty, therefore we need a fallback to properly insert the
element then.
Fixes https://github.com/nextcloud/dashboard/issues/10
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-03 12:14:39 +02:00
a4dda465c2
let user set avatar in nextcloud von LDAP provides invalid image data
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 01:45:07 +02:00
552da85df8
Iron User_LDAP tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 00:29:34 +02:00
aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning
...
Fix undeclared method warning in phan
2018-07-02 17:40:39 +02:00
48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash
...
fix double slash in search result path when the result is in a submount
2018-07-02 15:49:27 +02:00
6e9dbe7d15
Merge pull request #10078 from nextcloud/bugfix/activity-277/invalid-actor-and-calendar-for-link-shares
...
Correctly parse the subject parameters for link (un)shares of calendars
2018-07-02 15:43:36 +02:00
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
Joas Schilling
Bjoern Schiessle
Robin Appelman
John Molakvoæ (skjnldsv)
Julius Härtl
blizzz