Samuel Georges beb818efa5 Merge branch 'develop' into laravel5 ...

Conflicts:
	modules/cms/classes/CmsCompoundObject.php
	modules/system/ServiceProvider.php

2015-02-04 19:35:55 +11:00

..

assets

depends -> dependsOn

2015-01-29 20:32:24 +11:00

behaviors

Merge branch 'develop' into laravel5

2015-02-04 19:35:55 +11:00

classes

Merge branch 'develop' into laravel5

2015-02-04 19:35:55 +11:00

controllers

Radical reorg of some classes

2015-01-28 11:49:54 +11:00

database

Fixes #836

2014-12-17 08:04:09 +11:00

facades

Updating backend/facades

2014-10-10 23:36:04 +02:00

formwidgets

Merge branch 'develop' into laravel5

2015-02-04 19:35:55 +11:00

lang

Refs #900 - Add polish language

2015-01-31 14:26:45 +11:00

layouts

Fixes #828 - php artisan october:util compile assets

2015-01-12 20:08:53 +11:00

models

Merge branch 'develop' into laravel5

2015-02-04 19:35:55 +11:00

skins

Updating modules/backend/skins

2014-10-11 00:05:35 +02:00

traits

Radical reorg of some classes

2015-01-28 11:49:54 +11:00

views

Important! All references to *Email* have been changed to *Mail*

2014-07-04 19:14:15 +10:00

widgets

Merge branch 'develop' into laravel5

2015-02-04 19:35:55 +11:00

composer.json

Convert autoload refs to PSR-4 so they actually work

2014-09-19 17:23:11 +10:00

routes.php

Cleanup

2015-01-03 12:41:23 +01:00

ServiceProvider.php

Merge branch 'develop' into laravel5

2015-02-04 19:35:55 +11:00