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

..

asset

Widgets no longer need to pass their config via options:

2014-06-20 22:00:23 +10:00

content

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

layout

Widgets no longer need to pass their config via options:

2014-06-20 22:00:23 +10:00

page

Implemented the hidden page flag. Closes #34. Closes #88.

2014-07-03 17:40:44 +11:00

partial

Widgets no longer need to pass their config via options:

2014-06-20 22:00:23 +10:00

Asset.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CmsCompoundObject.php

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

CmsException.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CmsObject.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CmsObjectCollection.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CmsObjectQuery.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CmsPropertyHelper.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CodeBase.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CodeParser.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

CombineAssets.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

ComponentBase.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

ComponentHelpers.php

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

ComponentManager.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

ComponentPartial.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

Content.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

Controller.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

FileHelper.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

Layout.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

LayoutCode.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

ObjectMemoryCache.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

Page.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

PageCode.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

Partial.php

Welcome to the world, October :-)

2014-05-14 23:24:20 +10:00

Router.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

SectionParser.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

Theme.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

UnknownComponent.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00

ViewBag.php

Updating modules/cms/classes

2014-10-11 01:22:03 +02:00