Commit Graph

660 Commits

Author SHA1 Message Date
Sam Georges f7dfd35d08 Merge branch 'master' into develop 2014-09-04 13:10:44 +10: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 9197dbed59 ValidationException should be aliased. System and Application should probably be aliased too. 2014-09-03 19:46:28 +10:00
Sam Georges 0e3d909bd0 Add missing refs and accessors for pageObj and layoutObj 2014-09-03 08:48:15 +10: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 f829fbca3c column-name -> field-name 2014-08-30 15:06:11 +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 0acd45e4ca Styling and API improvements to code editor 2014-08-30 15:03:35 +10:00
Sam Georges fcf31b05ae Added new dump() Twig function 2014-08-30 12:34:03 +10:00
Sam Georges 3193006e2e Beef up the debug extension 2014-08-30 12:23:12 +10:00
Sam Georges 0243f47651 Fixes empty reference when using Form widget outside FormController 2014-08-30 09:49:48 +10:00
Sam Georges aaffeacf1d Fixes #584 - pt-br locale not defined correctly. 2014-08-30 09:42:55 +10:00
Sam Georges db2cea630b * Build 139 2014-08-30 08:56:58 +10:00
Sam Georges 1d300ace98 Add prototype code for token breaker 2014-08-29 23:53:13 +10:00
Sam Georges b8bf570289 Add initial version of dump() twig function / debug extension 2014-08-29 21:55:41 +10:00
Sam Georges 77bc72e0e1 Fixes #590, parse in all model attribute values when making a redirect 2014-08-29 19:37:38 +10:00
Samuel Georges f6189053b2 Merge pull request #592 from planetadeleste/patch1
Fixes #591 - Use translations in filters
2014-08-29 19:30:11 +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
Alvaro Cánepa 1dacca06f2 Add Filter translations 2014-08-29 00:56:52 -03:00
Alvaro Cánepa 12c9efbde6 Use translations instead of direct English word. 2014-08-29 00:47:05 -03:00
alekseybobkov e72c30a3c8 Fixes drop-down fields in dashboard widgets. Closes #588 2014-08-29 14:19:20 +11:00
alekseybobkov 012d5a4d1c Merge branch 'develop' of github.com:octobercms/october into develop 2014-08-29 14:16:33 +11:00
Sam Georges 833ba1f48d Set the default sort order 2014-08-29 09:27: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 c1bb7cec32 Typo 2014-08-23 21:52:35 +10:00
Sam Georges 4e4df36dad Tidy up code 2014-08-23 21:46:03 +10:00
Samuel Georges 789d798eb1 Merge pull request #585 from Flynsarmy/listOrderColumn
Allow complex sortable columns
2014-08-23 21:16:44 +10:00
flynsarmy 9bf5821a3b Allow complex sortable columns 2014-08-23 17:35:18 +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 9cebf5fbb8 Make extend truly come last 2014-08-23 13:07:39 +10:00
Sam Georges 2adeb7de2d Streamline partial usage in form fields and list columns 2014-08-23 11:11:49 +10:00
Sam Georges 7beafebf7c getClassExtension -> asExtension (shorter syntax) 2014-08-23 09:41:48 +10:00
Sam Georges 3c8f3cdb3f Ctrl/Cmd+S should work inside Redactor 2014-08-22 21:47:22 +10:00
Sam Georges 4db38b1650 Improve october.hotkey.js 2014-08-22 21:02:32 +10:00
Sam Georges 799273414f Update redactor to latest 2014-08-22 20:15:12 +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
Samuel Georges fb56fbfabd Merge pull request #573 from mrmlnc/develop
ru_lang (138)
2014-08-22 08:07:10 +10:00
Samuel Georges 111589dec6 Merge pull request #577 from stefantalen/dutch-translations
Updated dutch language files
2014-08-22 08:06:48 +10:00
Stefan Talen 5455c6c1af Updating dutch language files 2014-08-21 23:07:50 +02: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
Samuel Georges e73f82bffe Merge pull request #570 from Flynsarmy/popupErrors
Refs #568 - Inherit the parent framework error function
2014-08-21 08:12:43 +10:00
Denis Malinochkin 9a798cf46a ru_lang (138) 2014-08-20 17:10:22 +04:00
flynsarmy 80b10bd45b Refs #568 - Inherit the parent framework error function 2014-08-20 15:37:10 +10:00
Sam Georges 5df02a3eb9 Refs #568 - Inherit the parent framework success function 2014-08-20 10:12:44 +10:00
Sam Georges d2e2e1ffff Local events also don't need prefixes 2014-08-19 21:34:59 +10:00