973ccd8c5c
Merge pull request #14315 from nextcloud/feature/12033/calendar-user-address-set
...
implement principal property search for calendar user address set property
2019-03-21 21:32:45 +01:00
f5c0ea852e
Merge pull request #13721 from oole/bug/12729_postgresql_duplicate_key_value
...
Issue 12729 postgresql duplicate key value
2019-03-21 21:18:32 +01:00
f889beae7e
Fix PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-21 17:05:57 +01:00
d74e49b3e6
implement principal property search for calendar user address set property
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-03-21 16:32:41 +01:00
5564a302fe
Merge pull request #14790 from nextcloud/bugfix/noid/fix-ocm/ocs-provider-setup-checks
...
Fix setup checks for ocm/ocs-provider
2019-03-21 16:31:15 +01:00
432eb98516
Merge pull request #14786 from nextcloud/bugfix/noid/remove-unused-member
...
Remove unused member "util"
2019-03-21 15:00:08 +01:00
19db60f1f5
Fix setup checks for ocm/ocs-provider
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-21 14:26:59 +01:00
494d737f7e
Remove unused member "util"
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-21 12:42:35 +01:00
0d778fcc4e
Code cleanup.
...
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
2019-03-21 11:42:00 +01:00
63350423d4
Add insertIgnoreConflict to IDBConnection interface.
...
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
2019-03-21 11:42:00 +01:00
d62da82bf9
Add supression of SqlInjectionChecker.
...
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
2019-03-21 11:42:00 +01:00
c9b6487393
Add PostgreSQL specific implementation for includeIgnoreConflict.
...
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
2019-03-21 11:42:00 +01:00
a48ea8cffa
Add insertIgnoreConflict to Adapter and use it for for executing the file locking.
...
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
2019-03-21 11:42:00 +01:00
0155edc195
Merge pull request #14778 from nextcloud/user_ldap_createuser_fix
...
Fix user creation using LDAP Plugin
2019-03-21 11:32:22 +01:00
61572a5b2e
LDAP plugin: force createUser to return new user's DN
...
LDAP plugins must change the createUser method to return the DN, as we
need this to update the cache.
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-21 10:20:46 +01:00
a2c38148e7
Cache cleaning when subadmin adds user to group
...
This commit fix an error happening when the subadmin tries to create an
user, adding him/her to the group s/he is subadmin of, using a LDAP
User/Group plugin.
This just forces the cache to be reset after an user is added to a
group.
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-21 10:20:46 +01:00
c4dbc428f9
fix user creation using LDAP Plugin
...
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-21 10:20:46 +01:00
651495e3ae
Merge pull request #14776 from nextcloud/fix/files/size-color
...
Use max contrast variable to cap the generated colours
2019-03-21 09:59:07 +01:00
2389b616a3
Merge pull request #14695 from nextcloud/enhancement/grid/sharing-in-menu
...
Show sharing in menu in grid view
2019-03-21 09:56:50 +01:00
aee0b7693b
Merge pull request #14606 from nextcloud/bugfix/stricter-check-trusted-proxy
...
Make check for empty trusted proxies more strict
2019-03-21 09:15:27 +01:00
ec09f121af
Use max contrast variable to cap the generated colours
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-21 08:45:01 +01:00
ff164db935
Add link icon for public link too
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-21 08:16:00 +01:00
4c884f1b23
Put sharing entry all above
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-21 08:14:24 +01:00
4ad922d4f6
Show sharing in menu in grid view
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-21 08:14:16 +01:00
6ea5beccd7
[tx-robot] updated from transifex
2019-03-21 01:13:49 +00:00
6fae7ae5ce
Merge pull request #14774 from nextcloud/fix/bundle_enable_tests
...
Temp disable bundle tests
2019-03-20 22:29:56 +01:00
093c75802c
Temp disable bundle tests
...
The bundle acceptance tests fails after #14578 sometimes. This is
because of a race condition. not all apps have compatible 16 versions
yet. So trying to enable them results in those apps doing 💥 .
Because of #14578 we do show them now. So we try to enable them. However
depending on which requests finishes first the disable button for the
audit app either shows up or now.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-20 20:44:11 +01:00
ff629ad158
Trigger warning if empty array or false and X-Forwarded-Host is present
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-20 20:00:20 +01:00
03dc79f665
Merge pull request #14578 from nextcloud/enh/force_enable_apps
...
Force enable apps
2019-03-20 19:22:38 +01:00
b72d270a9b
Merge pull request #14753 from nextcloud/revert-13097-feature/11319/where-is-your-data
...
Revert "Where is your data?"
2019-03-20 19:20:50 +01:00
f8859e91dd
Merge pull request #14766 from nextcloud/backport/14709/master
...
groupname like username - allow share with both
2019-03-20 19:08:44 +01:00
ab7858d1a9
Update lib/private/Share20/Manager.php
...
tabulator change
Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
2019-03-20 15:33:35 +00:00
bb367f8cdd
Update lib/private/Share20/Manager.php
...
fixed tabulator
Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
2019-03-20 15:33:35 +00:00
03ee137804
groupname like username - allow share with both
...
Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
2019-03-20 15:33:34 +00:00
8b21c5e64d
Revert "Do not register unexisting section"
...
This reverts commit 24354bde1d
2019-03-20 15:17:31 +01:00
575b3f9ff8
Revert "Where is your data?"
2019-03-20 15:17:31 +01:00
942281a48e
Remove unused IUserSession
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-20 15:16:13 +01:00
2d00e2bbe7
Do not ignore the max-version for the "update-available" check
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-20 15:16:13 +01:00
95c9e0edd2
Remove apps from the list which have no release at all
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-20 15:16:13 +01:00
769cb629ae
allow enforcing apps to ignore the max version
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-20 15:16:11 +01:00
1c8779dc6e
Merge pull request #14713 from nextcloud/fix/admin-2fa-collapse-disable
...
Collapse 2FA admin detail settings if disabled
2019-03-20 14:20:46 +01:00
3855d78b2c
Make check for empty trusted proxies more strict
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-20 12:18:42 +01:00
3311d9533a
Collapse 2FA admin detail settings if disabled
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-03-20 12:09:43 +01:00
69f18712ea
Merge pull request #14674 from CamilionEU/master
...
[app:files] Use current directory for hashing.
2019-03-20 11:20:41 +01:00
6458dd841c
Merge pull request #14691 from nextcloud/rename-mountpoint-within-mountpoint
...
always allow moving mountpoints inside the same mountpoint
2019-03-20 10:58:10 +01:00
21c726ae53
[tx-robot] updated from transifex
2019-03-20 01:12:47 +00:00
2fcb6ddc22
Merge pull request #14664 from nextcloud/bugfix/noid/absolute-paths-of-images-for-linked-collaboration-resources
...
Replace the icon-class with an absolute link to an image
2019-03-19 19:23:29 +01:00
a5a2c7d818
Merge pull request #14747 from nextcloud/fix/access_list_external_storage
...
Fix getting the access list on external storage
2019-03-19 18:43:23 +01:00
af03d3a491
Merge pull request #14744 from nextcloud/bugfix/noid/fix-push-notifications-for-updatenotifications
...
Always register the Notifier
2019-03-19 16:42:54 +01:00
cc29f5d719
always allow moving mountpoints inside the same mountpoint
...
even if that mountpoint isn't normally a valid target for moving mounts into
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-19 15:56:18 +01:00
Morris Jobke
Georg Ehrke
Roeland Jago Douma
Joas Schilling
Ole Ostergaard
Ole Ostergaard
Vinicius Cubas Brand
John Molakvoæ (skjnldsv)
Nextcloud bot
Roeland Jago Douma
Daniel Kesselberg
Christian Aigner
Christoph Wurst
Christoph Wurst
Robin Appelman