summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix spacesLoki30002017-01-101-1/+1
|
* fix bracketsLoki30002017-01-101-2/+4
|
* remove non required db requestsLoki30002017-01-101-1/+6
|
* remove non required db requestsLoki30002017-01-101-1/+4
|
* Default value for null userLoki30002017-01-091-0/+1
| | | | | For guest users on every request executes query: SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null) as I see, uid can't be equal to null by design.
* Merge pull request #2987 from nextcloud/no-empty-bundleLukas Reschke2017-01-093-8/+23
|\ | | | | dont write a certificate bundle if the shipped ca bundle is empty
| * dont write a certificate bundle if the shipped ca bundle is emptyRobin Appelman2017-01-093-8/+23
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2992 from nextcloud/fix_subdir_install_styleMorris Jobke2017-01-091-3/+3
|\ \ | | | | | | Fix subdir install style
| * | Fix subdir install styleRoeland Jago Douma2017-01-091-3/+3
| | | | | | | | | | | | | | | | | | * We need to pass the serverroot so that it can include the right files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2985 from nextcloud/fix-trusted-domain-errorLukas Reschke2017-01-091-8/+16
|\ \ \ | | | | | | | | Allow access to CSS resources
| * | | Allow access to CSS resourcesLukas Reschke2017-01-091-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2984 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2814 from nextcloud/appstore_etag_validationJoas Schilling2017-01-094-11/+204
|\ \ \ \ | |/ / / |/| | | Add ETag validation to appstore requests
| * | | Add ETag validation to appstore requestsRoeland Jago Douma2017-01-054-11/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the ETag if present store it * If a stored ETag is present then pass it along (with the original response) to get * Add tests * Added files to classmap Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-0960-416/+914
| |/ / |/| |
* | | Merge pull request #2512 from nextcloud/cleanup-system-tag-usageRoeland Jago Douma2017-01-065-53/+103
|\ \ \ | | | | | | | | Only allow admins to delete tags
| * | | Adjust the JS unit testsJoas Schilling2016-12-061-16/+71
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Only allow admins to delete tagsJoas Schilling2016-12-064-37/+32
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2930 from ↵Roeland Jago Douma2017-01-063-0/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/kill-group-restriction-when-not-applicable Remove group restrictions when those are not allowed anymore
| * | | | Remove group restrictions when those are not allowed anymoreJoas Schilling2017-01-043-0/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #2948 from nextcloud/allow-global-composer-to-be-usedMorris Jobke2017-01-061-9/+19
|\ \ \ \ \ | | | | | | | | | | | | Allow to use a global composer instance
| * | | | | Allow to use a global composer instanceJoas Schilling2017-01-051-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #2934 from nextcloud/quota-stream-non-globalRoeland Jago Douma2017-01-063-79/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove the need to register the quota streamwrapper globally
| * | | | | | remove the need to register the quota streamwrapper globallyRobin Appelman2017-01-043-79/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #2968 from nextcloud/update-3rdpartyMorris Jobke2017-01-061-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Update 3rdparty
| * | | | | | Update 3rdparty after the merge of #2050Morris Jobke2017-01-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #2966 from nextcloud/ldif-mime-supportRoeland Jago Douma2017-01-062-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | recognize LDIF (and schema) file types
| * | | | | | recognize LDIF (and schema) file typesArthur Schiwon2017-01-062-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #2050 from nextcloud/scss-switch-baseRoeland Jago Douma2017-01-0636-3196/+5519
|\ \ \ \ \ \ | | | | | | | | | | | | | | Switch to SCSS: base files
| * | | | | | Fix js testsRoeland Jago Douma2017-01-063-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Theme update pages via CSSMorris Jobke2017-01-062-0/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SCSS on-the-fly generation isn't allowed during update * fallback to plain CSS Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Update autoloaderRoeland Jago Douma2017-01-062-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Fix css url prefix for IgnoreFrontController enabled configsJohn Molakvoæ (skjnldsv)2017-01-061-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | ScssCcacher typo fixJohn Molakvoæ (skjnldsv)2017-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Camelcase fixJohn Molakvoæ (skjnldsv)2017-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Remove webroot from file pathLukas Reschke2017-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The webroot is already provided, otherwise this links to stuff like "/nextcloud/nextcloud/index.php" instead of "/nextcloud/index.php" Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Adds CssControllerTestsRoeland Jago Douma2017-01-064-17/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Fix variables should be passed by referenceJohn Molakvoæ (skjnldsv)2017-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Updated installation css for config error and updateJohn Molakvoæ (skjnldsv)2017-01-061-476/+557
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Removed old css filesJohn Molakvoæ (skjnldsv)2017-01-0610-3642/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | 3rdparty branch setJohn Molakvoæ (skjnldsv)2017-01-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Tooltip scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Systemtags scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Styles scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+1274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Share scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Multiselect scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Jquery-ui-fixes scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Inputs scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+782
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Icons scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Header scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Apps scssJohn Molakvoæ (skjnldsv)2017-01-061-0/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>