Ingo Schommer
|
a86e4ee00c
|
Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
tests/injector/InjectorTest.php
tests/travis/before_script
|
2013-02-18 14:15:42 +01:00 |
|
ARNHOE
|
70d20ada3a
|
Create nl.js
|
2013-02-18 02:20:02 -08:00 |
|
Hamish Friedlander
|
4681673896
|
FIX TinyMCE context menu displaying default dialogs instead of our one
|
2013-01-31 16:39:00 +13:00 |
|
Mateusz Uzdowski
|
d8fdda79be
|
BUGFIX: Add comments and fix IE problems (class is a reserver JS word).
|
2012-05-25 09:31:15 +12:00 |
|
Simon Welsh
|
bb29ff3611
|
FEATURE: Allow adding media to the CMS using oEmbed
|
2012-05-24 17:00:21 +12:00 |
|
Sean Harvey
|
f3137e5b2b
|
BUGFIX Fixed regression where image and link popups don't open
|
2012-04-17 15:13:55 +12:00 |
|
Simon Welsh
|
df08c2fadf
|
API-CHANGE Move tinymce plugins in thirdparty
|
2012-04-16 12:25:49 +02:00 |
|