Ingo Schommer 6176d65bd2 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	forms/gridfield/GridFieldSortableHeader.php
	model/DataList.php
	model/fieldtypes/Enum.php

2013-12-02 20:49:34 +01:00

..

code

Merge branch '3.1'

2013-11-11 18:18:25 +11:00

css

Merge branch '3.1'

2013-11-11 18:18:25 +11:00

images

FEATURE: Disable specific tree nodes in TreeDropdownField

2013-10-02 12:53:23 +01:00

javascript

Merge remote-tracking branch 'origin/3.1'

2013-12-02 20:49:34 +01:00

scss

Merge branch '3.1'

2013-11-11 18:18:25 +11:00

templates

Merge branch '3.1'

2013-11-11 18:18:25 +11:00

tests

BUG Issues with CMSForm not consistently respecting new form naming scheme.

2013-10-30 17:08:31 +13:00

thirdparty

Updated history.js dependency

2013-03-20 00:46:32 +01:00

_config.php

API TinyMCE contextmenu is disabled by default

2013-10-23 19:15:16 +03:00

.gitignore

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

config.rb

Set default encoding for compass

2013-10-30 16:11:11 +00:00