Commit Graph

51 Commits

Author SHA1 Message Date
Dan Harrin 9521dd795c Minor Formatting Corrections in Usage Comments (#4541)
Credit to @DanHarrin
2019-08-15 09:14:54 -06:00
Ben Thomson a59d3b83eb Code quality clean up (#4449)
Credit to @bennothommo
2019-07-18 08:50:37 -06:00
Samuel Georges c5bc804d73 Remove redundant header_remove() call
The response is returned directly to the route so this is not needed, it was likely added as an artefact of a previous implementation

Refs #3773
Refs #3746
2019-03-29 06:02:06 +11:00
Antonie Hogewoning e481206b49 Add file specific aliases for framework.extras (#3936)
This commit adds two new aliases for the files associated with `framework.extras`. One to load the CSS (`framework.extras.css`) and for JS (`framework.extras.js`). Credit to @CptMeatball. Resolves #3909. Related: https://github.com/octobercms/docs/pull/334
2018-11-22 09:25:51 -06:00
Antonie Hogewoning 0e9b3ce786 Combine jQuery and migrate into the same file (#3919)
Fixes #3917. This fixes the double alias that was introduced when jquery was updated and migrate was added. Credit to @CptMeatball
2018-11-17 16:22:51 -06:00
Ayumi Hamasaki 567f415e1e Updated jQuery from V2 to V3.3.1, added jQuery Migrate (#3886)
Credit to @ayumihamsaki. Fixes #3230.
2018-10-30 19:36:44 -06:00
Rike-cz a03a76ee52 Finish implementing localPath in combineToFile (#3727)
Fixes #3721. Credit to @Rike-cz
2018-09-23 14:38:59 -06:00
Nathan van der Werf 0f0d108da0
Remove unused imports 2018-08-24 19:51:59 +02:00
Nathan van der Werf 66fa03f17e
Revert "Remove unused imports"
This reverts commit 742a5f415b.
2018-08-24 19:40:40 +02:00
Nathan van der Werf 8b6f11e6ac Extract child instructions 2018-08-15 19:25:42 +02:00
Nathan van der Werf 742a5f415b Remove unused imports 2018-08-15 18:27:36 +02:00
Jim Cottrell bfee483805 Adds support for minifying framework assets (#3240)
Fixes #2753. Credit to @jimcottrell
2018-07-05 17:57:17 -04:00
Alexander Shapoval 13596c8629 Add Cache-Control header to combined assets (#3430)
Related: #2474
2018-03-06 08:31:37 -06:00
James Allen a697970b92 fix documentation #3160 2017-10-10 21:24:56 -04:00
Luke Towers 68e874dc97 AssetMaker Improvements (#2847)
* Check if asset file exists before symbolizing path

Adds a check to see if the asset file exists before attempting to symbolize it, this will allow the asset combiner to be passed assets with complete paths instead of only relative paths.

* Implement combiner business logic

* Improve handling of bad inputs
2017-04-27 00:17:05 -06:00
Quezler cc17b679f1 Code dusting (#2826)
Code cleaning according to PSR-2 w/ exemptions (mostly dust).
2017-04-24 21:38:19 +10:00
Samuel Georges 8aa9d25a91 Broadcast combined assets as static
Follow on from 329a275f10
Fixes #2474 (again)
2017-03-31 13:02:16 +11:00
Samuel Georges 0a981a25f7 API docs progress
Controller -> SystemController for consistency
2017-03-16 17:08:20 +11:00
Samuel Georges 22bc5fce68 Bust OP cache for CMS template cache files
Fixes #2385
2017-01-20 07:20:08 +11:00
Samuel Georges 329a275f10 Prevent code eval on cached assets
When the request tells the server that the asset is cached, there is no point firing up the combiner, computing the contents and affecting performance. This change should result in a nice boost in secondary page load times.

Thanks to @zerkms for pointing this out

Fixes #2474
2016-11-23 08:42:47 +11:00
Pásztor Gábor cf1fda7437 Allow combine scss files from command. 2016-11-16 20:09:46 +01:00
Samuel Georges b02e4d7ecf Resolve paths correctly when deep hashing
Fixes #2270
2016-08-05 07:51:15 +10:00
Samuel Georges b1a86b5f9f Performance enhancement
Don't use deep handing lastMod check if we don't have to
2016-07-30 16:14:54 +10:00
Samuel Georges 3a6bf35f06 Only need to pasa a single asset now 2016-07-30 16:06:37 +10:00
Samuel Georges cf76e4c64a Performance enhancement 2016-07-30 16:05:37 +10:00
Samuel Georges b08e2c4912 Introduce deep hashing on asset combiner
Added cms.enableAssetDeepHashing config item, disabled by default
Recompile assets
Refs #2248
Refs https://github.com/octobercms/library/pull/225
2016-07-30 15:06:50 +10:00
Christian Willing 2b71055677 change spaces 2016-07-27 11:49:16 +02:00
Christian Willing 743d2d1b4e added scss to core 2016-07-10 19:44:54 +02:00
Christian Willing c343758d7c asset cache fix 2016-07-06 11:21:15 +02:00
Samuel Georges d7ef9b1738 Apply chmod rules to combiner cache 2016-06-18 09:23:16 +10:00
Samuel Georges 744d5654b3 ThemeData model now busts the [front-end] combiner cache
Separation of concerns, move the combiner asset variable injection logic to the cms module
Tweak readme
2016-06-03 07:22:05 +10:00
Samuel Georges 27dc84c59b ThemeData can now pass variables to the combiner
Add support for fileuploads to ThemeData
Fixes #1539
2016-06-02 05:23:05 +10:00
Samuel Georges 87a4de40de Address serialize/unserialize issues
This will require a cache clear for the combiner
Ref https://davidwalsh.name/php-serialize-unserialize-issues
2016-04-16 08:22:31 +10:00
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