aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Template
Commit message (Collapse)AuthorAgeFilesLines
...
* Simplify ternary operator statementsMorris Jobke2018-01-261-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Use type casting instead of *val() methodMorris Jobke2018-01-261-2/+2
| | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Fixes password input being prompted every time.Abijeet2018-01-081-0/+1
| | | | | | | | | Fixes #7106 - Echoing the current server time via a JS variable and storing the current time on page load in JS. - Calculating the diff and taking it into account when deciding whether to show the password confirmation. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
* disable password confirmation with SSOBjoern Schiessle2018-01-021-0/+3
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Fixed testsJohn Molakvoæ (skjnldsv)2017-12-301-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Added tests for various installations typesJohn Molakvoæ (skjnldsv)2017-12-301-8/+10
| | | | | | | | | | | | | - With root installation - Core css - App inside server root - Secondary apps directory outside server root - With an installation in a sub directory - Core css - App inside server root - Secondary apps directory outside server root Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixup! getWebdir returnJohn Molakvoæ (skjnldsv)2017-12-301-6/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Use OC_Util function for app web pathJohn Molakvoæ (skjnldsv)2017-12-301-11/+14
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* getWebDir functionJohn Molakvoæ (skjnldsv)2017-12-301-15/+19
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixed webroot for scss filesJohn Molakvoæ (skjnldsv)2017-12-302-9/+11
| | | | | | Fixed tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixed scss url rewritingJohn Molakvoæ (skjnldsv)2017-12-301-8/+14
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Hide delete button if the avatar is a generated oneJulius Härtl2017-12-191-0/+1
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Reduce length of md5 in scss cachingJohn Molakvoæ (skjnldsv)2017-12-141-2/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpathMorris Jobke2017-11-142-0/+12
|\ | | | | {J,CS}SResourceLocator: account for symlinks in app path
| * JSResourceLocator: re-use $app_pathKyle Fazzari2017-11-121-7/+9
| | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * JSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-071-3/+8
| | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * CSSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Currently, if the app path includes a symlink, the calculated webDir will be incorrect when generating CSS and URLs will be pointing to the wrong place, breaking CSS. Use realpath when retrieving app path, and these issues go away. Fix #6028 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | If for some reason the json can't be decoded it is not cachedRoeland Jago Douma2017-11-081-0/+4
| | | | | | | | | | | | Should fix #6898 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Update license headersMorris Jobke2017-11-066-0/+23
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Do not stop on scss compilation failureJohn Molakvoæ (skjnldsv)2017-09-261-0/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixed webroot detectionJohn Molakvoæ (skjnldsv)2017-09-221-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fix "webroot not found" when installed to the root of the webserverRobin Appelman2017-09-202-4/+4
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Fix webroot throwJohn Molakvoæ (skjnldsv)2017-09-141-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fix undefined variable $tmpRootAxel Helmert2017-09-121-5/+5
| | | | | | Refactoring of webroot detection left an unused variable. Fixes: #6415 Signed-off-by: Axel Helmert <info@luka.de>
* Refactor webroot detection in resource locatortux-rampage2017-09-062-64/+68
| | | | | | | | | | | The current implementation breaks installations with symlinks to directories inside the webroot (i.E. apps). With this change both variants, directory and symlinks, will be detected correctly. Fixes: #6028 Signed-off-by: Axel Helmert <axel.helmert@luka.de>
* Rebuild SCSS files if frontend controller value changesJulius Härtl2017-09-031-1/+2
| | | | fixes #6271
* Cleanup unused methodsMorris Jobke2017-08-151-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Logo claim is not used anymoreMorris Jobke2017-08-021-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Properly handle if the deps file if for some reason emptyMorris Jobke2017-07-191-1/+14
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #5252 from derkostka/masterMorris Jobke2017-06-212-2/+2
|\ | | | | Use realpath to obtain the webroot.
| * Squashed the webroot fixSebastian Kostka2017-06-202-2/+2
| | | | | | | | Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
* | Fix theming app to also use the prefixJulius Härtl2017-06-161-5/+10
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Make cache and scss caching depend on the baseUrlJulius Härtl2017-06-151-2/+6
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Set SCSS dependencies to memcache on compileRoeland Jago Douma2017-05-211-1/+3
| | | | | | | Else when an upgrade happens we will recompile all the SCSS files all the time (until the cache expires). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Stop infinit loop on invalid settings css/js fileJoas Schilling2017-05-193-0/+26
| | | | | | Don't try to find dirname of false... Signed-off-by: Joas Schilling <coding@schilljs.com>
* Cache deps list to memcache on write not on first readRoeland Jago Douma2017-05-161-2/+4
| | | | | | | | | | Fixes #4886 Caching on first read leads to the bug that if the files are updated we will never cache again. Since we will always fetch from the memcache (which works) and then see that the files are newer. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-251-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> Add Scss variables to example theme and theming app Signed-off-by: Julius Haertl <jus@bitgrid.net> Use SCSSCacher to build theming css Signed-off-by: Julius Härtl <jus@bitgrid.net> Update theming.scss Signed-off-by: Julius Härtl <jus@bitgrid.net> Code cleanup Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix tests Signed-off-by: Julius Härtl <jus@bitgrid.net> Inject SCSSCacher for easier testing Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix typehint Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Generate absolute URLs Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Fix tests to always use absolute urls for theming images Signed-off-by: Julius Härtl <jus@bitgrid.net> MailheaderColor -> ColorPrimary Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Remove unused use statementsMorris Jobke2017-04-221-1/+0
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-092-5/+8
| | | | | | | | | | | | | * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4093 from nextcloud/endorse-password-protectionRoeland Jago Douma2017-04-041-0/+4
|\ | | | | Endorse password protection
| * feature endorse password for share linksBjoern Schiessle2017-04-031-0/+4
| | | | | | | | | | | | | | | | works like "enforce password protection", but let the user optionally remove the password protection after the password is set. by Timo Benk Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4131 from nextcloud/fix-jscombinerChristoph Wurst2017-04-031-1/+1
|\ \ | |/ |/| Fix check for cache value in JSCombiner
| * Fix check for cache value in JSCombinerMorris Jobke2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | * fixes following log output, because there was empty string stored in the cache Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Fix gzip files for SafariMorris Jobke2017-03-292-4/+4
|/ | | | | | | * Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Fix testsRoeland Jago Douma2017-03-281-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-282-1/+17
| | | | | | | | | | Since in production the SCSS files are compiled once and the javascript files are combined once we can just as well gzip them aggresively. This means that once they are requested and the browser supports gzip we can just serve the gzipped file saving precious bandwidth. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Don't run JSCombiner when not installedLukas Reschke2017-03-251-3/+6
| | | | | | When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add returnRoeland Jago Douma2017-03-241-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add debug modeRoeland Jago Douma2017-03-242-1/+39
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add cachingRoeland Jago Douma2017-03-241-6/+42
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>