Commit Graph

6 Commits

Author SHA1 Message Date
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