Commit Graph

128 Commits

Author SHA1 Message Date
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
Sam Georges 57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
alekseybobkov 0b8af1f505 Merge branch 'develop' into static-pages-support 2014-10-10 22:27:01 -07:00
alekseybobkov 0b2481560b Merge branch 'develop' of github.com:octobercms/october into develop 2014-10-10 21:21:05 -07:00
alekseybobkov 8339323870 Fixes the bug where finding a component by class name is not possible if the component has an alias 2014-10-10 21:20:46 -07:00
Sam Georges 4504d5bf4c Improve translation handling 2014-10-11 10:37:48 +11:00
Sam Georges 1c4706bbbb Fixes unit tests so they pass 2014-10-09 18:08:28 +11:00
Sam Georges 7e62ef5925 Refs #670 - Attempt fix 2014-10-09 17:14:29 +11:00
alekseybobkov 26e8d5bda5 Minor updates in the back-end UI 2014-10-05 22:21:03 -07:00
alekseybobkov ef9a147d31 The CMS pages are now supported by the Static Pages menus 2014-10-02 15:55:55 -07:00
alekseybobkov 762088463c Merge branch 'develop' of github.com:octobercms/october into develop 2014-09-29 22:58:55 -07:00
alekseybobkov a534f7bc79 Fixes in the Richeditor styling. Implemented parsed content caching for content blocks. 2014-09-29 22:58:30 -07:00
Sam Georges b3936330a6 Moved the PathMaker trait functionality to Filesystem class (see October Rain) 2014-09-29 12:32:07 +10: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
alekseybobkov a9e2e2d80f Improvements in the CMS objects and back-end UI. 2014-09-18 20:34:24 -07:00
Anton Romanov 8ee57eee76 Update Page.php 2014-09-11 12:45:37 +08:00
Anton Romanov 7ded6e5fed Update Controller.php 2014-09-11 12:44:52 +08:00
alekseybobkov 9f4fa49068 Fixes a bug where saving a content block from the CMS back-end creates an empty [components] section in the file settings area. 2014-09-06 21:52:42 -07:00
alekseybobkov df55946b61 Merge branch 'misc-tmp' into develop 2014-09-03 20:01:17 -07:00
alekseybobkov 9572c17253 Minor changes in the back-end UI. The front-end router now triggers an event allowing to override the default routes. The CMS back-end UI now supports view bags in content files. 2014-09-03 19:58:21 -07: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 938f9957de Add PathMaker trait, Combiner now supports aliases and dynamic paths 2014-08-29 19:23:57 +10:00
Sam Georges cd51c37d19 Fixes LESS parser so the paths are no longer messed up 2014-08-29 19:23:56 +10:00
alekseybobkov fdd83b53c9 Updates in the back-end UX 2014-08-28 19:03:47 +11:00
Sam Georges eb6a912f28 Allow setParameters() in Cms Router 2014-08-28 08:19:08 +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
alekseybobkov e7767176ce Updated the treeview control, updated Redactor scripts, the CMS Content is now a compound object 2014-08-22 18:45:05 +11:00
Sam Georges 76b143e8d3 Components and variables can now be accessed in the page code section via `$this->foo` in addition to `$this['foo']`. 2014-08-21 20:04:41 +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
Samuel Georges bee85771c6 Merge pull request #544 from Flynsarmy/getTwigMethod
Add getTwig controller method
2014-08-13 21:23:54 +10:00
flynsarmy 55c0ba8934 Add getTwig controller method 2014-08-13 09:08:18 +10:00
Sam Georges 37291a0c63 Throw ApplicationException when AJAX handler not found 2014-08-13 07:52:47 +10:00
alekseybobkov 2018215c44 Implemented the view bag. Minor UX fix. 2014-08-06 22:42:09 +11:00
Sam Georges 8a86927944 Make ApplicationException more friendly 2014-08-03 10:34:33 +10:00
Sam Georges 56d0c3351b private -> protected 2014-08-01 14:54:16 +10:00
Sam Georges 6388ecef52 private -> protected 2014-08-01 13:58:59 +10:00
Sam Georges 8b7bbd1062 Add 'partial' type to list columns. 2014-08-01 10:42:14 +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 e85cbf80c5 Fixes unit tests 2014-07-29 13:14:54 +10:00