Commit Graph

18 Commits

Author SHA1 Message Date
Samuel Georges 4ddc8055c6 Merge branch 'develop' into stable 2016-03-25 18:39:16 +11:00
Samuel Georges 2a3a63857c text/javascript is obsolete. Fixes #1847 2016-03-21 19:13:01 +11:00
Pásztor Gábor 537f637e47 Storage path 2016-01-15 10:07:39 +01:00
Samuel Georges 2a26aa6889 Fixes combiner to only move ../css when in ./less 2015-07-29 19:14:54 +10:00
Samuel Georges 9ed73e0cba Updates for new symbolizePath API, requires latest rain lib code
Backend layouts can now be provided by plugins
2015-05-30 15:54:47 +10:00
Samuel Georges 7145aac457 Prepare for CDN, config rename cms.plugins|themes|uploadsDir -> cms.plugins|themes|uploadsPath
Deprecate data-trigger-type on triggerapi
Fixes ref to Util class
2015-02-17 20:58:38 +11:00
Samuel Georges 8eaedb3d5c Makes it easier to clear the cache 2015-02-11 20:40:48 +11:00
Samuel Georges 610ea932fc Fixes #856 - Implement a linking policy, defaults to relative 2015-02-09 21:52:17 +11:00
Samuel Georges 9a616b6174 Fix clear cache, update storage paths 2015-02-07 14:50:03 +11:00
Samuel Georges b1b700368f Radical reorg of some classes 2015-01-28 11:49:54 +11:00
Samuel Georges c4cef299dd Fixes #828 - php artisan october:util compile assets 2015-01-12 20:08:53 +11:00
Samuel Georges 8cdb24c40a Might be a good idea to just always set the not modified header if we can 2014-12-17 14:55:16 +11:00
Samuel Georges 512e91118f Improved asset caching, when enabled the server will send a 304 Not Modified header 2014-12-17 13:46:08 +11:00
Samuel Georges 48b90e86b6 Config item `cms.enableAssetMinify` can now be set to **null**, in which case assets are only minified if debug mode (`app.debug`) is disabled. 2014-12-06 13:43:06 +11:00
gergo85 2a05c2346f Update jQuery files
Demo theme: v1.10.2 -> v1.11.1
Backend: v2.0.3 -> v2.1.1
Furthermore I renamed the jquery-2.0.3.min.js file because of easy to
update jQuery in future.
2014-12-01 22:35:58 +01:00
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
Stefan Talen 06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
2014-10-16 18:44:18 +02:00
Sam Georges 57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00