mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity
1,123 Commits 35 Branches 172 Tags
Commit Graph

145 Commits

Author SHA1 Message Date
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