Damian Mooyman 0103b076c3 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	forms/Form.php
	model/ManyManyList.php

2015-06-17 15:41:13 +12:00

..

code

Merge remote-tracking branch 'origin/3'

2015-06-17 15:41:13 +12:00

css

Merge pull request #4292 from scott1702/drag-drop

2015-06-17 12:33:45 +12:00

images

Tidy up loading gif

2015-06-09 13:41:21 +12:00

javascript

API Deprecate delete in favour of archive

2015-06-03 14:24:27 +12:00

scss

Merge pull request #4292 from scott1702/drag-drop

2015-06-17 12:33:45 +12:00

templates

Add 'sticky' behaviour to left menu

2015-05-25 12:09:14 +12:00

tests

Form action validation excempts

2014-11-26 22:49:37 +13:00

thirdparty

Updated history.js dependency

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

_config.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12: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