Samuel Georges 1db67af8e8 Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade ...

Conflicts:
	modules/system/lang/en/lang.php

2017-07-11 10:48:54 +10:00

..

assets

Use tabs cssClass definition instead of JS

2017-06-05 17:33:37 +10:00

classes

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

components

Added SASS support to Resources component (#2961)

2017-07-10 17:29:11 -06:00

contracts

Allow CmsObjects to define their own Twig cache key

2016-03-21 13:42:03 +11:00

controllers

URL -> Url

2017-06-02 23:34:50 +10:00

database/migrations

Demo theme patch can be removed now

2017-02-15 20:50:52 +11:00

facades

Code dusting (#2826)

2017-04-24 21:38:19 +10:00

formwidgets

Add imageWidth and imageHeight parameters

2017-05-25 15:30:22 +02:00

helpers

Code dusting (#2826)

2017-04-24 21:38:19 +10:00

lang

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

models

string -> ::class + docs

2017-05-20 20:01:19 +10:00

reportwidgets

{@inheritDoc} -> @inheritDoc

2017-03-16 06:26:14 +11:00

traits

Pretty useful trait, discoverable in API docs

2017-05-30 19:56:36 +10:00

twig

URL -> Url

2017-06-02 23:34:50 +10:00

views

Update refs to flash message script

2015-05-28 20:33:49 +10:00

widgets

Rename methods in CollapsableWidget

2017-06-10 15:42:24 +10:00

composer.json

Change versions for testing

2017-05-19 14:13:23 +10:00

routes.php

Apply web middleware group for the good cookies

2017-05-13 22:18:13 +10:00

ServiceProvider.php

String to ::class

2017-06-03 10:31:24 +10:00