TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,101 Commits 3 Branches 0 Tags 78 MiB
Commit Graph

30 Commits

Author SHA1 Message Date
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
alekseybobkov 9a05a408c9 Added support for components in partials 2014-10-29 22:12:42 -07: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
Sam Georges ed552f1591 Minor code clean 2014-10-18 15:52:44 +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 9f5646d273 BackendSettings -> BrandSettings 
pageTitle is now translated at the end of the line
Fixed unit tests so they pass
SettingsModels are now cached
 2014-10-15 19:53:44 +11:00
Stefan Talen e9ce6f5d54 Updating modules/cms/controllers 2014-10-11 01:27:52 +02: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
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 8c07bfea15 Tokens expand when holding CTRL and double clicking (Yay!) 2014-08-30 16:21:16 +10:00
Sam Georges 357475c992 Token Breaker -> Token Expander, Add token expander to CMS editor 2014-08-30 16:05:19 +10:00
Sam Georges e55d4f9ea0 Performance improvement: CMS was passing all assets with each AJAX call 
Add token breaker plugin to CMS page
 2014-08-30 15:04:15 +10:00
Sam Georges d2e2e1ffff Local events also don't need prefixes 2014-08-19 21:34:59 +10:00
Sam Georges 7bd967cff5 Fix cms.template.save event, should always pass the primary object as the first/second parameter. 
This may be a breaking change for some, sorry about that.
 2014-08-19 21:33:03 +10:00
Sam Georges 6388ecef52 private -> protected 2014-08-01 13:58:59 +10:00
Sam Georges e6379ea21d Fixes bug when deleting cms templates 2014-07-25 18:11:16 +10:00
Sam Georges 86daf9f308 Add event emitter to backend controllers 
Minor tidy up
 2014-07-15 08:14:59 +10:00
Jmeyering 142c7f40ca Also adding in local events as per developer documentation 2014-07-14 12:15:23 +00:00
Jmeyering 7d1fe7833f One More naming issue 2014-07-14 07:09:01 -05:00
Jmeyering e9c3474c92 Fix Naming 
Updates to correct naming issue
 2014-07-14 07:07:43 -05:00
Jmeyering 5604a095fc fire events on template updates 2014-07-14 02:42:30 +00:00
alekseybobkov aee0777032 Display a correct CMS object name in the page title. Fixes #28. Fixes #354. 2014-06-26 15:29:38 +11:00
Sam Georges 82f586c0d1 Asset maker functions (addJs, addCss, addRss) now use an optional build code, either *core* or a plugin code. 2014-05-24 16:35:54 +10:00
Sam Georges c593123700 Components can now be dragged on to a page or layout 2014-05-24 15:18:59 +10:00
Sam Georges 193ffade54 Minor 2014-05-20 10:25:04 +10:00
Jmeyering 56a6eb0283 More extraneous spaces plus nailed a syntax error 2014-05-19 13:03:16 -05:00
Jmeyering 9994f62382 Removing extraneous spaces from this code 2014-05-19 13:02:25 -05:00
Jmeyering 03c99bbac0 Allow 2014-05-19 12:58:35 -05:00
Sam Georges 71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00