Daniel Hensby a0812f987a

Merge 3.1 into 3.2 ...

Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md

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

..

code

Do not hang on nested parameters in search context

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

css

Remove drag handle from non-draggable js-trees

2015-11-05 13:09:47 +13:00

images

Tidy up loading gif

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

javascript

Merge 3.1 into 3.2

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

scss

Remove drag handle from non-draggable js-trees

2015-11-05 13:09:47 +13:00

templates

Merge branch '3.1' into 3.2

2015-08-17 11:43:28 +01:00

tests

BUG Fix missing framework/admin/tests

2015-09-10 11:06:15 +12: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