wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
48887 commits 157 branches 562 tags 714 MiB
Commit graph

48887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ole Ostergaard
d62da82bf9 Add supression of SqlInjectionChecker. 
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
 2019-03-21 11:42:00 +01:00
Ole Ostergaard
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
Ole Ostergaard
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
Morris Jobke
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
Vinicius Cubas Brand
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
Vinicius Cubas Brand
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
Vinicius Cubas Brand
c4dbc428f9
fix user creation using LDAP Plugin 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
John Molakvoæ (skjnldsv)
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
John Molakvoæ (skjnldsv)
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
John Molakvoæ (skjnldsv)
4c884f1b23
Put sharing entry all above 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:14:24 +01:00
John Molakvoæ (skjnldsv)
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
Nextcloud bot
6ea5beccd7
[tx-robot] updated from transifex 2019-03-21 01:13:49 +00:00
Morris Jobke
6fae7ae5ce
Merge pull request #14774 from nextcloud/fix/bundle_enable_tests 
Temp disable bundle tests
 2019-03-20 22:29:56 +01:00
Roeland Jago Douma
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
Daniel Kesselberg
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
Roeland Jago Douma
03dc79f665
Merge pull request #14578 from nextcloud/enh/force_enable_apps 
Force enable apps
 2019-03-20 19:22:38 +01:00
Roeland Jago Douma
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
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
Christian Aigner
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
Roeland Jago Douma
8b21c5e64d
Revert "Do not register unexisting section" 
This reverts commit 24354bde1d.
 2019-03-20 15:17:31 +01:00
Roeland Jago Douma
575b3f9ff8
Revert "Where is your data?" 2019-03-20 15:17:31 +01:00
Joas Schilling
942281a48e
Remove unused IUserSession 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-20 15:16:13 +01:00
Joas Schilling
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
Joas Schilling
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
Roeland Jago Douma
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
Morris Jobke
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
Daniel Kesselberg
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
Christoph Wurst
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
Morris Jobke
69f18712ea
Merge pull request #14674 from CamilionEU/master 
[app:files] Use current directory for hashing.
 2019-03-20 11:20:41 +01:00
Roeland Jago Douma
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
Nextcloud bot
21c726ae53
[tx-robot] updated from transifex 2019-03-20 01:12:47 +00:00
Roeland Jago Douma
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
Morris Jobke
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
Christoph Wurst
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
Robin Appelman
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
Roeland Jago Douma
230dc505a1
Fix getting the access list on external storage 
If a file is on external storage there is no owner. WHich means we can't
check. So just return an empty array then.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-19 15:38:52 +01:00
Roeland Jago Douma
04bc272c72
Merge pull request #14739 from nextcloud/bugfix/noid/header-link-navigation-style-is-too-catchy 
Style of navigation links in header is too catchy
 2019-03-19 13:47:28 +01:00
Joas Schilling
21425eb964
Return 200 instead of 404 when asking for collections of a resource 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-19 13:13:53 +01:00
Julius Härtl
5de3a0feaa
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:13:51 +01:00
Julius Härtl
39438cf654
Bump nextcloud-vue-collections 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:56 +01:00
Julius Härtl
ec63d4ba29
Adjust gitattributes to ignore all files_sharing scripts in diff 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:55 +01:00
Julius Härtl
8a26022f92
Adjust resource type to file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:55 +01:00
Julius Härtl
e8fe00003b
Dispatch event to allow apps to load their script for collections 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:55 +01:00
Joas Schilling
3022ef687a
Use rich objects instead of name, link and icon 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-19 13:06:55 +01:00
Joas Schilling
403b673b93
Replace the icon-class with an absolute link to an image 
Otherwise the icon can not be displayed in mobile apps

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-19 13:06:55 +01:00