aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [9.2] Show avatar in share drop down (#25976)Thomas Müller2016-10-112-9/+27
| | | | | | | | * Show avatar in share drop down * Fix share autocomplete vertical align with avatar Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #1682 from nextcloud/bump_doctrineMorris Jobke2016-10-112-10/+10
|\ | | | | Bump doctrine
| * Fix QueryBuilderTestsThomas Müller2016-10-111-10/+10
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [3rdparty] Bump doctrineRoeland Jago Douma2016-10-111-0/+0
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2016-10-114-0/+4
|
* Merge pull request #1677 from nextcloud/cleanup-testsMorris Jobke2016-10-101-10/+15
|\ | | | | Cleanup test case
| * Fix typehintRoeland Jago Douma2016-10-101-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Cleanup test caseThomas Müller2016-10-101-10/+15
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1683 from ↵Roeland Jago Douma2016-10-101-1/+1
|\ \ | |/ |/| | | | | nextcloud/issue-1437-installing-app-with-code-checker Add app name to the call
| * Add app name to the callJoas Schilling2016-10-101-1/+1
| | | | | | | | | | | | Regression from 69b063f4c614a46bbe5f0ffcab11ddb08c183f04 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1679 from nextcloud/downstream-26282Roeland Jago Douma2016-10-101-1/+1
|\ \ | | | | | | Improve user list rendering perf by not resorting after every add (#2…
| * | Improve user list rendering perf by not resorting after every add (#26282)Vincent Petry2016-10-101-1/+1
| | | | | | | | | | | | | | | The call to UserList.add() was wrong and was passing "user.lastLogin" as the sort argument which would cause the list to be resorted over and over again for every added item after loading the next page of users.
* | | Merge pull request #1680 from nextcloud/downstream-26308Roeland Jago Douma2016-10-109-1/+1
|\ \ \ | | | | | | | | Remove PNG fallbacks from files app
| * | | fix drag and drop icon for files appMorris Jobke2016-10-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Remove PNG fallbacks from files app (#26308)Vincent Petry2016-10-108-0/+0
| |/ /
* | | Merge pull request #1675 from nextcloud/remove-unneeded-variableLukas Reschke2016-10-101-5/+2
|\ \ \ | | | | | | | | remove unneeded variable & proper element creation
| * | | remove unneeded variable & proper element creationMorris Jobke2016-10-101-5/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #1674 from nextcloud/downstream-26183Morris Jobke2016-10-101-0/+14
|\ \ \ | |_|/ |/| | Added test for 26182
| * | Added test for 26182Sergio Bertolin2016-10-101-0/+14
| |/
* | Merge pull request #1668 from nextcloud/user_ldap_use_appconfigMorris Jobke2016-10-1027-61/+165
|\ \ | | | | | | Do not query data that is already in the appconfig
| * | Use more IConfig and add unit testsRoeland Jago Douma2016-10-102-21/+120
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | DI IConfig into ldap helperRoeland Jago Douma2016-10-1026-27/+43
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not query data that is already in the appconfigRoeland Jago Douma2016-10-101-23/+12
| | | | | | | | | | | | | | | | | | This is already available. We better use a simple regex. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1673 from nextcloud/php7.1-rc3Morris Jobke2016-10-101-2/+2
|\ \ \ | | | | | | | | Bump 7.1 CI to RC3
| * | | Bump 7.1 CI to RC3Roeland Jago Douma2016-10-101-2/+2
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1114 from nextcloud/display_all_resharesRoeland Jago Douma2016-10-102-4/+52
|\ \ \ | |/ / |/| | Display link reshares
| * | Fix HTMLRoeland Jago Douma2016-10-101-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | align layout of other link sharesMorris Jobke2016-10-101-4/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Display link resharesRoeland Jago Douma2016-10-102-4/+46
|/ / | | | | | | | | | | | | * No longer filterout all other link shares * Display link shares in shareelist (below normal shares) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1672 from nextcloud/cache_non_exisiting_db_userRoeland Jago Douma2016-10-101-2/+7
|\ \ | | | | | | Cache non existing DB user
| * | Cache non existing DB userRoeland Jago Douma2016-10-101-2/+7
| |/ | | | | | | | | | | | | | | | | We always query the database backend. Even if we use a different one (ldap for example). Now we do this everytime we try to get a user object so caching that a user is not in the DB safes some queries on each request then (at least 2 what I found). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1660 from nextcloud/add-notification-icon-to-apiChristoph Wurst2016-10-103-12/+76
|\ \ | | | | | | Add an icon to the notification API
| * | Add an icon to the notification APIJoas Schilling2016-10-073-12/+76
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1640 from nextcloud/less_queries_group_shareMorris Jobke2016-10-101-30/+49
|\ \ \ | | | | | | | | More efficient group share resolving
| * | | More efficient group share resolvingRoeland Jago Douma2016-10-061-30/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resolving a group share to the user group share we used to do this on a per share basis. Now we try to do this for all group shares at once. Of course still chunked. Before: N incomming group shares this would mean 1 + N queries Now: N incomming roups shares this would mean 1 + 1 queries Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #1663 from nextcloud/dont-reparse-info-xmlMorris Jobke2016-10-107-69/+71
|\ \ \ \ | | | | | | | | | | Dont reparse info xml + cache AppInfo XML
| * | | | Cache AppInfo in Memory Cache if configuredLukas Reschke2016-10-073-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves around 20ms on a bare-bone instance, on bigger ones more (depending on the number of installed apps). See https://blackfire.io/profiles/compare/fc326ad3-100d-49b8-8ea9-8343240f53f3/graph Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Don't parse info.xml but reuse already cached app infos - fixes #25603 (#25968)Thomas Müller2016-10-077-66/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't parse info.xml but reuse already cached app infos - fixes #25603 * Use === in InfoParser. Fixes test * InfoParser should not depend on UrlGenerator - fixes issue with session being closed too early
* | | | | Merge pull request #1656 from nextcloud/appinfo-check-class-existanceChristoph Wurst2016-10-101-0/+122
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make sure all the jobs, command, provides and migrations are valid
| * | | | Make sure all the jobs, command, provides and migrations are validJoas Schilling2016-10-071-0/+122
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-1028-40/+374
| | | |
* | | | Merge pull request #1658 from nextcloud/fix-log.conditionMorris Jobke2016-10-091-1/+1
|\ \ \ \ | | | | | | | | | | Default to empty string
| * | | | Default to empty stringLukas Reschke2016-10-071-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise `null` is returned which leads to a ton of similar error messages if the log condition setting is enabled.: ``` {"reqId":"3wVBarnDfOV3qkI1bVCU","remoteAddr":"89.98.78.41","app":"PHP","message":"hash_equals(): Expected user_string to be a string, null given at \/var\/www\/html\/lib\/private\/Log.php#275","level":3,"time":"2016-10-07T14:22:15+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/","user":"icewind"} ```
* | | | Merge pull request #1665 from nextcloud/speed-up-is-subdirectory-testMorris Jobke2016-10-093-43/+26
|\ \ \ \ | | | | | | | | | | Simplify isSubDirectory check
| * | | | Simplify isSubDirectory checkLukas Reschke2016-10-073-43/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | Shaves off another 9ms per request as can be seen at https://blackfire.io/profiles/compare/dd54cef3-e58d-4a22-b8f4-c7c4b70697be/graph Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-0914-2/+166
| | | |
* | | | Merge pull request #1661 from nextcloud/fix_1659Lukas Reschke2016-10-081-3/+3
|\ \ \ \ | | | | | | | | | | use older php array syntax in index.php
| * | | | use older php array syntax in index.phpGeorg Ehrke2016-10-071-3/+3
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-10-0880-70/+680
|/ / / /
* | | | Merge pull request #1648 from nextcloud/bump_moment_jsRoeland Jago Douma2016-10-072-8/+9
|\ \ \ \ | | | | | | | | | | Bump moment.js