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

42979 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ (skjnldsv)
24659342f5
fixup! Check if groups is array, return empty do not throw 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-19 15:12:32 +01:00
John Molakvoæ (skjnldsv)
2493e9426d
Check if groups is array, return empty do not throw 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 15:32:36 +01:00
John Molakvoæ (skjnldsv)
f5137fef6c
Fixed tests and improved code 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 11:44:20 +01:00
John Molakvoæ (skjnldsv)
aa1e8713fb
Fixed throw error on unreachable users 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 09:38:09 +01:00
John Molakvoæ (skjnldsv)
ce625bbad5
Add userdetails to ocs api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 09:19:47 +01:00
Roeland Jago Douma
fa886ef4eb
Merge pull request #8830 from nextcloud/node_emit_read 
Emit read for nodes
 2018-03-15 14:04:14 +01:00
blizzz
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name 
Full implement group display names
 2018-03-15 12:07:30 +01:00
Roeland Jago Douma
d6b326650b
Emit read for nodes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-15 11:18:39 +01:00
Roeland Jago Douma
fde08a9619
Merge pull request #8793 from nextcloud/swift-config 
Swift uses `containter` not `bucket`
 2018-03-15 08:34:58 +01:00
Roeland Jago Douma
f2b93f5246
Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-user-searches 
Fix configuration values matched in user searches
 2018-03-15 08:34:21 +01:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Daniel Calviño Sánchez
0b96a71a68 Fix configuration values matched in user searches 
Due to a misplaced closing parenthesis the condition of the left join
clause was just "userid = uid"; the other conditions were passed as
additional parameters to "leftJoin", and thus they were ignored.
Therefore, the result set contained every preference of each user
instead of only the email, so the "WHERE configvalue LIKE XXX" matched
any configuration value of the user.

Besides the closing parenthesis this commit also fixes the literal
values. Although "Literal" objects represent literal values they must be
created through "IExpressionBuilder::literal()" to be properly quoted;
otherwise it is just a plain string, which is treated as a column name.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-14 23:31:42 +01:00
Roeland Jago Douma
d3e7996e80
Fix bucket and container usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-14 13:57:14 +01:00
Roeland Jago Douma
23a02eaf14
Merge pull request #8818 from nextcloud/remove-alternative-logins-title 
Remove "Alternative logins" title on login page
 2018-03-14 13:52:35 +01:00
Morris Jobke
990ca145d7
Remove "Alternative logins" title on login page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-14 11:38:57 +01:00
Morris Jobke
8e47f10714
Merge pull request #8816 from nextcloud/cleanup-ocp-contacts 
Remove deprecated OCP\Contacts
 2018-03-14 11:21:49 +01:00
Morris Jobke
8d4b76c0e2
Remove deprecated OCP\Contacts 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-14 10:47:09 +01:00
Roeland Jago Douma
2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link 
Remove deprecated URL functions for OCP\Util
 2018-03-14 09:49:51 +01:00
Roeland Jago Douma
0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper 
Remove deprecated HTTPHelper
 2018-03-14 09:49:24 +01:00
Nextcloud bot
7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Roeland Jago Douma
b93d26a209
Replace ContactsManager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:18:38 +01:00
Roeland Jago Douma
83873e3da1
Remove deprecated URL functions for OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:04:08 +01:00
Roeland Jago Douma
7785c3752f
Remove deprecated HTTPHelper 
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 21:54:56 +01:00
blizzz
76d23a1600
Merge pull request #8806 from nextcloud/add-local-memcache-check 
Properly provide local memcache check to ICacheFactory
 2018-03-13 21:27:24 +01:00
Morris Jobke
dde5353f98
Properly provide local memcache check to ICacheFactory 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 18:18:04 +01:00
Morris Jobke
ede723f1b1
Merge pull request #8796 from nextcloud/varadic_qb 
Make QueryBuilder varadic
 2018-03-13 14:11:19 +01:00
Morris Jobke
274106b80b
Merge pull request #8800 from nextcloud/getstoragestats_to_controller 
Move storagestats endpoint to proper controller
 2018-03-13 14:08:30 +01:00
Roeland Jago Douma
f52ba44edb
Move storagestats endpoint to proper controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 12:44:48 +01:00
Morris Jobke
58599e0360
Merge pull request #8781 from nextcloud/cleanup-old-federation-code 
Remove old code to be compatible with Nextcloud 9 and before
 2018-03-13 11:53:21 +01:00
Morris Jobke
45895de531
Merge pull request #8794 from nextcloud/swift-v3-cache-token 
Properly cache swift v3 token
 2018-03-13 11:35:38 +01:00
Morris Jobke
a827160cfa
Merge pull request #8797 from nextcloud/inject-public-igroupmanager-instead-of-private-groupmanager 
Inject public IGroupManager instead of private GroupManager
 2018-03-13 10:42:10 +01:00
Daniel Calviño Sánchez
044d5a8d01 Inject public IGroupManager instead of private GroupManager 
The public "IGroupManager" service returned by the dependency injection
system is automatically initialized with an "OC\Group\Database" backend.
However, no backend is automatically set in private "GroupManager"
instances. Therefore, a private "GroupManager" instance does not work as
expected when initialized through the dependency injection system.

Due to that this commit reverts a previous change in which the public
"IGroupManager" was replaced by a private "GroupManager" instance. That
change was needed when strict types were set, as "getSubAdmin()" is not
part of "IGroupManager" API, so the type had to be changed to
"GroupManager". Until a better solution is found strict types are
disabled again to be able to inject "IGroupManager" and also use
"getSubAdmin()".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-13 09:52:27 +01:00
Morris Jobke
7488218535
Merge pull request #8792 from nextcloud/cleanup-oc_response 
Remove unused methods of OC_Response
 2018-03-13 09:47:29 +01:00
Roeland Jago Douma
46c195b58b
Made IExpressionBuilder varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:35:09 +01:00
Roeland Jago Douma
0009358c17
Made orHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:32:31 +01:00
Roeland Jago Douma
408c2103db
Made addHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:33 +01:00
Roeland Jago Douma
2c585afea1
Make having varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:04 +01:00
Roeland Jago Douma
c6eba3c925
Made addGroupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:30:14 +01:00
Roeland Jago Douma
afbad7e15e
Made groupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:29:36 +01:00
Roeland Jago Douma
d6b93e6620
Made orWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:28:27 +01:00
Roeland Jago Douma
07cb6aaeff
Made andWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:43 +01:00
Roeland Jago Douma
222dbb7bc9
Made where varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:11 +01:00
Roeland Jago Douma
2976b39102
Made AddSelect varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:25:32 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 09:22:26 +01:00
Morris Jobke
57eaa48e3d
Merge pull request #8788 from nextcloud/cleanup-oc_api 
Remove unused methods and constants from legacy OC_API
 2018-03-13 08:52:24 +01:00
Roeland Jago Douma
c8aee70a0b
Made select varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 08:07:08 +01:00
Nextcloud bot
3cae276149
[tx-robot] updated from transifex 2018-03-13 01:12:01 +00:00
Roeland Jago Douma
66173e9b52
Merge pull request #8789 from nextcloud/proper-exception-logging 
Use proper method to log exceptions
 2018-03-12 22:01:10 +01:00
Roeland Jago Douma
4e8d5504d2
Properly cache swift v3 token 
The V3 token has an export function. Without this the token is
effectively never cached.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-12 20:53:50 +01:00
Morris Jobke
fac0a11576
Merge pull request #8786 from nextcloud/remove-insert-if-not-exists 
Use insertIfNotExist of the new interface
 2018-03-12 18:44:16 +01:00