Ingo Schommer 1088d044c5 Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	.travis.yml

2012-09-07 17:21:41 +02:00

..

code

LeftAndMain::$session_namespace

2012-08-29 15:10:05 +02:00

css

Merge branch '3.0'

2012-08-28 16:08:57 +12:00

images

ENHANCEMENT: Change media insertion to use button and apply design

2012-06-11 10:54:48 +02:00

javascript

Merge remote-tracking branch 'origin/3.0'

2012-09-07 17:21:41 +02:00

scss

Merge branch '3.0'

2012-08-28 16:08:57 +12:00

templates

Merge branch '3.0'

2012-08-10 00:19:00 +02:00

tests

MINOR Fix broken test

2012-05-28 12:03:13 +12:00

thirdparty

Fix chosen dropdown width not being set.

2012-08-16 23:26:29 +02:00

_config.php

BUGFIX Inlining TinyMCE HTML popup (fixes #7451)

2012-06-13 14:39:50 +02:00

.gitignore

MINOR Removing executable flag from all files (thanks miiihi)

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

config.rb

MINOR Removing compass asset_cache_buster functionality, as it wrongly changes the hashes even if files haven't changed, causing merging hassles - leave cache control to the webserver

2011-12-20 17:46:43 +01:00