Daniel Hensby 745faebd81

Merge 3.2 into 3.3 ...

Conflicts:
	.travis.yml

2016-04-26 00:17:09 +01:00

..

code

Do not hang on nested parameters in search context

2016-03-21 15:54:22 +13:00

css

FIX Autocomplete loading spinner now showing

2016-03-21 15:15:00 +13:00

font

Add new font icons to set

2016-02-04 10:34:30 +13:00

images

Update button and tab styles

2015-07-15 10:35:21 +12:00

javascript

Merge 3.2 into 3.3

2016-04-26 00:17:09 +01:00

scss

FIX Autocomplete loading spinner now showing

2016-03-21 15:15:00 +13:00

templates

Re-instate back button for item edit forms

2016-02-05 09:39:57 +00:00

tests

BUG Fix missing framework/admin/tests

2015-09-10 11:06:15 +12:00

thirdparty

update cms notifications

2015-09-02 15:47:48 +12: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

Update compass config

2015-07-09 10:11:00 +12:00