upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-14 22:53:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31
42952 commits 777 branches 1186 tags 6.6 GiB
Commit graph

8343 commits

Author SHA1 Message Date
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
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
0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper 
Remove deprecated HTTPHelper
 2018-03-14 09:49:24 +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
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
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
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
e758cfcdc8
Remove unused methods of OC_Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:42:30 +01:00
Morris Jobke
a1232f46ca
Remove unused methods and constants from legacy OC_API 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:03:25 +01:00
Morris Jobke
2b335fd607
Use insertIfNotExist of the new interface 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 17:45:49 +01:00
Morris Jobke
3655951dd7
Merge pull request #8787 from nextcloud/remove-deprecated-and-unused-methods-of-db 
Remove deprecated and unsused methods of OCP\DB
 2018-03-12 16:34:37 +01:00
Morris Jobke
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper 
Remove unused and deprecated class and interface AppHelper
 2018-03-12 16:33:46 +01:00
Morris Jobke
f5c5c5181f
Remove unused and deprecated class and interface AppHelper 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:27:10 +01:00
Morris Jobke
44289ff134
Use proper method to format absolute timestamp 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:16:52 +01:00
Morris Jobke
8195b17ed7
Remove deprecated and unsused methods of OCP\DB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:13:37 +01:00
blizzz
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination 
Tests for email collaborators pagination
 2018-03-09 11:21:21 +01:00
Roeland Jago Douma
129a608ebe
OCP\AppFramework\App strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 08:42:03 +01:00
Roeland Jago Douma
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing 
Remove base url from global cache prefix
 2018-03-08 21:12:54 +01:00
Roeland Jago Douma
d05469959e
Merge pull request #8715 from nextcloud/objectstore-no-part-files 
disable part files for object stores
 2018-03-08 20:52:16 +01:00
Joas Schilling
882096653e
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 16:22:16 +01:00
Morris Jobke
a2db959f5c
Merge pull request #8593 from eneiluj/master 
Allow public page access to apps with group restrictions
 2018-03-08 11:27:52 +01:00
Roeland Jago Douma
3ad7daeda5
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 11:05:18 +01:00
Roeland Jago Douma
340e8ef16c
Make SecurityMiddleware strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 10:11:47 +01:00
Morris Jobke
069e3f50a7
Merge pull request #8711 from nextcloud/objectstore-write-only-fopen 
don't read existing file when overwriting using object store
 2018-03-08 09:32:39 +01:00
Roeland Jago Douma
af55b03386
Merge pull request #8662 from nextcloud/better-debugging-unit-tests 
Better debugging for "Your test case is not allowed to access the dat…
 2018-03-07 21:53:34 +01:00
Joas Schilling
1dd40b1f45
Single quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:50:18 +01:00
Joas Schilling
559978c50e
Suppress phan error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:43:16 +01:00
Julius Härtl
63e261b444
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
f652c28b21
Use JSCombiner from server container when searching for JS files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Morris Jobke
8d865483f4
Merge pull request #8714 from nextcloud/8705 
Check if the cached js file exists
 2018-03-07 14:45:43 +01:00
Robin Appelman
fc35352122
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 13:33:35 +01:00
Roeland Jago Douma
34b86edc34
Check if the cached js file exists 
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-07 12:55:05 +01:00
Robin Appelman
9764e70494
don't read existing file when overwriting using object store 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 12:05:57 +01:00