summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add tests for Lookup PluginArthur Schiwon2017-09-264-4/+181
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* shareeAPIController unit test clean up and last fixesArthur Schiwon2017-09-262-57/+22
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* remove unused methodArthur Schiwon2017-09-262-43/+0
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* move splitUserRemote unit testsArthur Schiwon2017-09-262-72/+75
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adapt unit test for ensuring exceptionArthur Schiwon2017-09-261-2/+2
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* split off former searchSharee unit testArthur Schiwon2017-09-264-184/+235
| | | | | | also moves registering default plugins to Server for proper unit testing Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adjust ShareeAPIController invalid-input search unit testArthur Schiwon2017-09-261-16/+15
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adjust ShareeAPIController search testArthur Schiwon2017-09-262-32/+22
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* split off getEmail testsArthur Schiwon2017-09-263-245/+338
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* split off getRemote unit testsArthur Schiwon2017-09-263-222/+316
| | | | | | adds two small fixes → they actually work \o/ Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* split off getGroups unit testsArthur Schiwon2017-09-262-392/+491
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* split off getUsers unit testsArthur Schiwon2017-09-263-320/+447
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* minor fixesArthur Schiwon2017-09-262-1/+2
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* add missing PHP docArthur Schiwon2017-09-261-1/+16
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* updated autoloaderArthur Schiwon2017-09-262-2/+2
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* finetune the appinfo parserArthur Schiwon2017-09-261-1/+4
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* allow more than one plugin per share typeArthur Schiwon2017-09-262-8/+12
| | | | | | | however it does not dedupe (appears too complex/expensive while we don't havve the issue currently) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* make it possible to register plugins and kick out the circle oneArthur Schiwon2017-09-265-62/+32
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* don't keep result types hard codedArthur Schiwon2017-09-2611-58/+122
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* missing PHP doc for public interfacesArthur Schiwon2017-09-263-2/+18
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* update autoloaderArthur Schiwon2017-09-262-0/+22
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Splits off the logic from sharees endpoint thus making it available fromArthur Schiwon2017-09-2613-558/+1062
| | | | | | within Nc/via PHP. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #6646 from nextcloud/federation-activeRoeland Jago Douma2017-09-261-3/+5
|\ | | | | Highlight active federation scope menu entry with bold heading
| * Highlight active federation scope menu entry with bold headingJan-Christoph Borchardt2017-09-261-3/+5
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #6650 from nextcloud/tooltip-shadow-use-variableJan-Christoph Borchardt2017-09-261-1/+1
|\ \ | | | | | | Fit the tooltip shadow to the default variable
| * | Fit the tooltip shadow to the default variableJohn Molakvoæ (skjnldsv)2017-09-261-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #6647 from nextcloud/scss-no-take-only-throwJohn Molakvoæ2017-09-261-0/+2
|\ \ \ | | | | | | | | Do not stop on scss compilation failure
| * | | Do not stop on scss compilation failureJohn Molakvoæ (skjnldsv)2017-09-261-0/+2
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #6643 from nextcloud/improved-redis-warningMorris Jobke2017-09-262-1/+13
|\ \ \ | |_|/ |/| | Improve exception handling
| * | Improve exception handlingMorris Jobke2017-09-262-1/+13
|/ / | | | | | | | | | | | | | | | | | | If there is an exception in the template handling then a white page is shown. This improves the handling of this and shows text only about the internal error. To test this just setup redis as cache and then disable the php-redis module. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-09-2614-4/+68
| |
* | Merge pull request #6544 from nextcloud/fix/duplicate-session-tokenMorris Jobke2017-09-252-0/+9
|\ \ | |/ |/| Fix duplicate session token after remembered login
| * Fix duplicate session token after remembered loginChristoph Wurst2017-09-202-0/+9
| | | | | | | | | | | | | | | | | | On a remembered login session, we create a new session token in the database with the values of the old one. As we actually don't need the old session token anymore, we can delete it right away. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #6372 from nextcloud/scss-normalizationJohn Molakvoæ2017-09-2520-1466/+1342
|\ \ | | | | | | Scss normalization
| * | Fixed testsJohn Molakvoæ (skjnldsv)2017-09-251-8/+9
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix busy state loading animation in filesJohn Molakvoæ (skjnldsv)2017-09-232-5/+11
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Removed unused filter for opacity, fix #6408John Molakvoæ (skjnldsv)2017-09-2312-78/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Settings button as nav entryJohn Molakvoæ (skjnldsv)2017-09-231-11/+15
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Replaced colours by variablesJohn Molakvoæ (skjnldsv)2017-09-238-109/+83
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Settings scssJohn Molakvoæ (skjnldsv)2017-09-232-1312/+1284
| | | | | | | | | | | | | | | | | | | | | Scss conversion Cleanup settings scss Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Removed unneeded bgs and borders. Replaced hard coded colours byJohn Molakvoæ (skjnldsv)2017-09-237-33/+30
| | | | | | | | | | | | | | | | | | variables. Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #6632 from nextcloud/do_not_show_hyphenRoeland Jago Douma2017-09-253-3/+3
|\ \ \ | | | | | | | | Do not show hyphen
| * | | expect call of getSlogan() exactly twiceStephan Müller2017-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephan Müller <mail@stephanmueller.eu> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | do not show hyphen after instance name in emails if slogan does not existStephan Müller2017-09-252-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #6627 from nextcloud/icon-on-apps-settingsJoas Schilling2017-09-2514-6/+73
|\ \ \ \ | | | | | | | | | | Icon on apps settings
| * | | | Fix typoJohn Molakvoæ (skjnldsv)2017-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Icons & default classesJohn Molakvoæ (skjnldsv)2017-09-2414-7/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed categories order same as app store Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #6630 from nextcloud/same_site_cookie_middlewareMorris Jobke2017-09-259-18/+313
|\ \ \ \ \ | | | | | | | | | | | | Handle SameSiteCookie check for index.php in AppFramework Middleware
| * | | | | Handle SameSiteCookie check for index.php in AppFramework MiddlewareRoeland Jago Douma2017-09-249-18/+313
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #6633 from nextcloud/dav-remove-like-when-not-neededJoas Schilling2017-09-251-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't add a LIKE condition when it's not needed