aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Move to ABackendRoeland Jago Douma2018-03-221-2/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Move Database backend over to new User/Backend interfacesRoeland Jago Douma2018-03-221-16/+30
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #8506 from nextcloud/use-appmanagerMorris Jobke2018-03-223-16/+10
|\ | | | | Use isInstalled of AppManger instead of reimplement it
| * Use isInstalled of AppManger instead of reimplement itMorris Jobke2018-03-213-16/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8791 from nextcloud/cleanup-oc_jsonMorris Jobke2018-03-222-28/+6
|\ \ | | | | | | Remove unused methods of OC_Json
| * | Remove unused methods of OC_JsonMorris Jobke2018-03-212-28/+6
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8922 from nextcloud/deprecated-ocp-files-methodsRoeland Jago Douma2018-03-221-0/+8
|\ \ \ | | | | | | | | Deprecated some methods of OCP\Files
| * | | Deprecate OCP\FilesMorris Jobke2018-03-211-0/+8
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8923 from nextcloud/typosMorris Jobke2018-03-211-1/+1
|\ \ \ | | | | | | | | Fix some typos
| * | | Fix some typosMorris Jobke2018-03-211-1/+1
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / Remove unused and deprecated methods of OCP\DBMorris Jobke2018-03-211-6/+6
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Show EOL warning in the update sectionJoas Schilling2018-03-201-0/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8822 from nextcloud/fix/8641/undefined-indexblizzz2018-03-191-5/+11
|\ \ | | | | | | the FN is optional, carrying the displayname if present
| * | the FN is optional, carrying the displayname if presentArthur Schiwon2018-03-141-5/+11
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Store setUserValue as string in cacheRoeland Jago Douma2018-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cache the values we set in the setUserValue function. However since the values are strings in the database we check if a value is equal with string comparison Now if the function was called with a $value of int or float. It would be stored in the DB (and thus converted to string) and in the cache (not converted thus as int/float). Now if another call comes in that sets it to the same value (I'm looking at you LDAP!). The check would fail since we would be comparing int/float to string which fails by definition. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8878 from nextcloud/remove_tmpfileRoeland Jago Douma2018-03-193-6/+6
|\ \ | | | | | | Remove deprecated tmpFile/tmpFolder
| * | Remove \OCP\Files::tmpFolderRoeland Jago Douma2018-03-191-3/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Remove \OCP\Files::tmpFileRoeland Jago Douma2018-03-193-3/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Remove unused private functionRoeland Jago Douma2018-03-191-15/+0
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8857 from nextcloud/swift-verify-cached-tokenMorris Jobke2018-03-192-12/+24
|\ \ | | | | | | verify cached swift token
| * | verify cached swift tokenRobin Appelman2018-03-162-12/+24
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Remove unused resolveReshare of old sharing codeMorris Jobke2018-03-161-23/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8830 from nextcloud/node_emit_readRoeland Jago Douma2018-03-151-0/+7
|\ \ \ | | | | | | | | Emit read for nodes
| * | | Emit read for nodesRoeland Jago Douma2018-03-151-0/+7
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8255 from nextcloud/bugfix/noid/group-display-nameblizzz2018-03-154-6/+28
|\ \ \ | | | | | | | | Full implement group display names
| * | | Use group displayNames in users listJohn Molakvoæ (skjnldsv)2018-03-082-4/+26
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Correctly return the group nameJoas Schilling2018-03-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Show the displayname in the users group listJoas Schilling2018-03-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8793 from nextcloud/swift-configRoeland Jago Douma2018-03-152-2/+6
|\ \ \ \ | | | | | | | | | | Swift uses `containter` not `bucket`
| * | | | Fix bucket and container usageRoeland Jago Douma2018-03-142-2/+6
| | |/ / | |/| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8828 from ↵Roeland Jago Douma2018-03-151-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/fix-configuration-values-matched-in-user-searches Fix configuration values matched in user searches
| * | | Fix configuration values matched in user searchesDaniel Calviño Sánchez2018-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #8804 from nextcloud/remove_httphelperRoeland Jago Douma2018-03-143-138/+16
|\ \ \ \ | | | | | | | | | | Remove deprecated HTTPHelper
| * | | | Remove deprecated HTTPHelperRoeland Jago Douma2018-03-133-138/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the HTTP Helper * Remove from Server Containter * Removed legacy share tests that use it Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8806 from nextcloud/add-local-memcache-checkblizzz2018-03-132-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | Properly provide local memcache check to ICacheFactory
| * | | | Properly provide local memcache check to ICacheFactoryMorris Jobke2018-03-132-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #8796 from nextcloud/varadic_qbMorris Jobke2018-03-132-38/+44
|\ \ \ \ \ | |/ / / / |/| | | | Make QueryBuilder varadic
| * | | | Made IExpressionBuilder varadicRoeland Jago Douma2018-03-131-8/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made orHaving varadicRoeland Jago Douma2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made addHaving varadicRoeland Jago Douma2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Make having varadicRoeland Jago Douma2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made addGroupBy varadicRoeland Jago Douma2018-03-131-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made groupBy varadicRoeland Jago Douma2018-03-131-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made orWhere varadicRoeland Jago Douma2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made andWhere varadicRoeland Jago Douma2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made where varadicRoeland Jago Douma2018-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made AddSelect varadicRoeland Jago Douma2018-03-131-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made select varadicRoeland Jago Douma2018-03-131-3/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8794 from nextcloud/swift-v3-cache-tokenMorris Jobke2018-03-131-1/+6
|\ \ \ \ | | | | | | | | | | Properly cache swift v3 token
| * | | | Properly cache swift v3 tokenRoeland Jago Douma2018-03-121-1/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The V3 token has an export function. Without this the token is effectively never cached. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>