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

202 Commits

Author SHA1 Message Date
Samuel Georges 0c812a59e5 Merge pull request #782 from webmaxx/develop 
Added new symbols to page slug regexp in the backend.
 2014-11-19 20:53:34 +11:00
webmaxx b4819e73b3 Added new symbols to page slug regexp in the backend. 
Example slug:
/news/:page?|^[0-9]+$ - "/news/", "/news/2"
 2014-11-19 12:04:55 +04:00
Samuel Georges b6ec6ccf2c Pass mtime to menu resolving method results 2014-11-19 17:46:26 +11:00
Samuel Georges f351697c48 Streamline Theme object API (::load should be static as in CmsObject) 2014-11-19 17:45:57 +11:00
alekseybobkov ba32d9a1bf Merge branch 'develop' into viewbag-unification 2014-11-11 11:43:12 -08:00
Sam Georges cfaf3228d9 Fixes #9 - Adds maintenance mode setting to the CMS 2014-11-10 20:34:42 +11:00
alekseybobkov 802f96f10e Refactoring of the view bag support code 2014-11-03 20:50:18 -08:00
Sam Georges 7357954c84 Proposed fix for handling defaults when parsing external properties 2014-11-04 12:33:38 +11:00
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
Sam Georges 03e9f48333 Deprecate propertyOrParam 2014-10-31 20:01:17 +11:00
Sam Georges afcf50a585 noExternalParameter -> showExternalParameter 2014-10-31 19:57:07 +11:00
Sam Georges ac37d23d14 Tidy up code a lil 2014-10-30 16:54:56 +11:00
alekseybobkov 2a771190ea Merge branch 'develop' into dynamic-partials 2014-10-29 22:14:31 -07:00
alekseybobkov 9a05a408c9 Added support for components in partials 2014-10-29 22:12:42 -07:00
Sam Georges 4ac6469200 Original data does not exist for new objects 2014-10-23 08:11:11 +11: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
Sam Georges 8ee28b214d Minor code clean 2014-10-18 14:32:06 +11: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 acf2304ce2 Fixing test SectionParserTest::testParseOffset 2014-10-12 14:23:47 +02:00
Stefan Talen 230a7377cf Updating files in modules/cms 2014-10-11 14:33:40 +02:00
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
 2014-10-11 11:58:20 +02: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
Stefan Talen 202e8869b1 Updating modules/cms/classes 2014-10-11 01:22:03 +02: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
Sam Georges 12f9c88345 Add hook for renderContent 
Fix priority of local<->global events
 2014-07-27 12:22:50 +10:00
Sam Georges 5d832a2f7b Fixes #461 2014-07-25 14:21:13 +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 0dabaf67c1 Files should not appear as themes 2014-07-24 19:16:17 +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 bbbe11c174 Fixes empty pages from routing as home (/) 2014-07-23 08:35:53 +10:00
Sam Georges 15b93c7b03 Rewind DI to prevent double up bug 2014-07-19 16:09:44 +10:00
Sam Georges a43f4f6b51 Use Parameters model instead of raw DB 2014-07-19 16:07:32 +10:00
alekseybobkov c324c80969 Added the theme selector 2014-07-19 13:05:50 +11:00
Sam Georges 3c7c87b338 Fixes #254 add Laravel helper functions to Twig environment 2014-07-16 10:30:39 +10:00
Sam Georges 63b98f56c5 Allow routing to nothing without looking up from the Request object 2014-07-14 19:06:23 +10:00
Sam Georges acce6eb902 Add utility function to Page cms object 2014-07-11 18:50:29 +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 1728f148a3 Fixes #361 - Assets paths fail on subfolders 2014-06-29 09:34:49 +10:00
Sam Georges 5c005f79d0 System Twig environment is now extended by plugins 
Move the markup manager to system
 2014-06-28 21:23:13 +10: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
alekseybobkov 5488429fe4 Fixed the unknown component caching problem. Added the unknown component handling to the back-end. AJAX request can now be stopped with preventing default action in the oc.beforeRequest event. Fixes #46. 2014-06-26 17:09:25 +11:00
Sam Georges fc25d67230 Fix docblock 2014-06-25 19:04:34 +10:00
Sam Georges 5eff2fb396 Tidy up code 2014-06-25 19:03:46 +10:00
Samuel Georges 460039cb57 Merge pull request #351 from Flynsarmy/themeFixes 
Add Theme::exists(), Fix getPath()
 2014-06-25 19:00:43 +10:00