Commit Graph

65 Commits

Author SHA1 Message Date
Sam Georges ac37d23d14 Tidy up code a lil 2014-10-30 16:54:56 +11:00
alekseybobkov 9a05a408c9 Added support for components in partials 2014-10-29 22:12:42 -07:00
Sam Georges 23f6d75416 Peer review of #679 2014-10-19 10:58:18 +11:00
Stefan Talen 509e7d2a12 Fixing issues with files in modules/cms 2014-10-18 12:03:48 +02:00
Stefan Talen 347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
2014-10-18 11:07:17 +02:00
alekseybobkov 219f1ff8f7 Merge branch 'develop' into static-pages-support
Conflicts:
	modules/backend/assets/less/controls/filelist.less
2014-10-16 21:03:20 -07:00
alekseybobkov 12175b29db Multiple updates in the back-end widgets and styles 2014-10-16 20:47:23 -07: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
Stefan Talen 202e8869b1 Updating modules/cms/classes 2014-10-11 01:22:03 +02:00
alekseybobkov a534f7bc79 Fixes in the Richeditor styling. Implemented parsed content caching for content blocks. 2014-09-29 22:58:30 -07:00
alekseybobkov dcf7bb7d4f Merge branch 'develop' into misc-tmp 2014-09-27 23:29:41 -07:00
alekseybobkov 6b42055184 Fixes in the rich editor, improved the content block rendering code, minor fixes in the popover and form styling. 2014-09-27 23:28:38 -07:00
Sam Georges 73feabaf18 Fixes unit tests, also rename October\Test to October\Tester to remove conflict between real plugin of that name 2014-09-20 17:59:19 +10:00
Sam Georges 23710dbbc3 No longer lower case partial override component alias Att: @chadstrat 2014-09-19 17:23:08 +10:00
Anton Romanov 7ded6e5fed Update Controller.php 2014-09-11 12:44:52 +08:00
Sam Georges 0e3d909bd0 Add missing refs and accessors for pageObj and layoutObj 2014-09-03 08:48:15 +10:00
Sam Georges b8bf570289 Add initial version of dump() twig function / debug extension 2014-08-29 21:55:41 +10:00
Sam Georges a0bfbfc0d6 CMS AJAX handlers now have a way to invoke the page cycle if desired 2014-08-23 17:23:29 +10:00
Sam Georges 20e279bf4c Page URLs now support dots (.)
Add hook for cms.page.init
2014-08-21 19:47:29 +10:00
Sam Georges bcc48054e7 Add hook to render page 2014-08-19 12:35:33 +10:00
Samuel Georges 0980c6d997 Merge pull request #549 from Flynsarmy/twigDebugState
Set twigs debug state to the same as Octobers
2014-08-16 18:01:33 +10:00
flynsarmy 35e4f9c4fb Tailing comma 2014-08-14 21:08:15 +10:00
flynsarmy 869765af76 Set twigs debug state to the same as Octobers 2014-08-14 21:06:58 +10:00
Sam Georges 3ff31f2180 Minor 2014-08-13 21:25:57 +10:00
flynsarmy 55c0ba8934 Add getTwig controller method 2014-08-13 09:08:18 +10:00
Sam Georges 8a86927944 Make ApplicationException more friendly 2014-08-03 10:34:33 +10:00
Sam Georges 6388ecef52 private -> protected 2014-08-01 13:58:59 +10:00
Sam Georges fb788c9c0a Make request and access log work 2014-07-30 17:33:26 +10:00
Sam Georges 200615f310 CMS Render partial now supports not throwing an exception.
Components without default partials do not throw errors when used on the page, they simply fail gracefully.
2014-07-29 13:52:01 +10:00
Sam Georges 12f9c88345 Add hook for renderContent
Fix priority of local<->global events
2014-07-27 12:22:50 +10:00
Sam Georges f8f4579f16 Show more detailed errors when custom error page is not enabled 2014-07-24 21:06:33 +10:00
Sam Georges 7cd80f8a59 Throw an error when the active theme is not found 2014-07-23 11:33:19 +10:00
Sam Georges 63b98f56c5 Allow routing to nothing without looking up from the Request object 2014-07-14 19:06:23 +10:00
alekseybobkov 9c4567fc0b Do not call the layout's onInit() method if there is no layout. 2014-07-09 00:11:59 +11:00
Sam Georges bab2f5c61c Typo 2014-07-07 17:40:00 +10:00
Sam Georges fdac3416e1 Added new layout and page method `onInit()` called after components are initialized and before AJAX requests are processed. 2014-07-07 17:39:22 +10:00
Sam Georges 7ecf361eb3 Fixes validation of requested partial names VS. partial names on file system 2014-07-06 12:42:08 +10:00
Sam Georges d912b73aab Clean up event parameters to dev standards 2014-07-04 19:14:14 +10:00
alekseybobkov 7056397036 Implemented the hidden page flag. Closes #34. Closes #88. 2014-07-03 17:40:44 +11:00
Sam Georges 7802213bcc Fixes #55 - Assets are now referenced correctly as Assets instead of URLs 2014-06-26 17:29:07 +10:00
Sam Georges 9d2d9b621f Create a System Twig extension, for shared features 2014-06-26 17:29:03 +10:00
Sam Georges ddfab72ecc Make {{ this.controller }} available 2014-06-24 20:47:30 +10:00
Sam Georges 070667ebe0 Improve CMS Exception handler.
Previously Twig syntax errors inside a component partial would show the incorrect file and line number. This is fixed.
Also simplified the approach so the stack trace is not hidden inside a closure.
2014-06-24 14:58:46 +10:00
Sam Georges dc9acd472a Fixes #328 - Move Twig init to Controller constructor 2014-06-20 15:37:19 +10:00
Sam Georges 28701f9a3b Backend and frontend controllers now return a Response object and support setting the status code 2014-06-17 21:00:26 +10:00
Sam Georges 041c6e408f Simplify logic, test + cert 2014-06-17 20:11:31 +10:00
Sam Georges 4c31211153 Allow Cms Controller to set status code 2014-06-17 20:05:40 +10:00
Louis Matthijssen 0ce75c412a Use 404 status code for custom 404 page
Fixes #275 and #291.
2014-06-16 18:17:20 +02:00
Sam Georges 8113371dac Establish the router earlier so we can create page URLs 2014-06-16 17:59:47 +10:00