Mario Visic
|
8ac8289394
|
Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
app/models/content_instance.rb
config/locales/admin_ui.de.yml
public/javascripts/admin/inline_editor_toolbar.js
spec/models/content_instance_spec.rb
|
2012-01-15 00:02:46 +10:30 |
|
Mac Shifford
|
131331633f
|
Added russian localisation to tiny_mcs
|
2012-01-12 17:19:42 +03:00 |
|
did
|
ed6020be3e
|
upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets
|
2011-10-30 13:17:05 +01:00 |
|
Sharagoz
|
f864980685
|
norwegian JS translations
|
2011-10-08 21:09:08 +02:00 |
|
Enrique García Cota
|
e0f11c8a5c
|
added es locale files for tiny_mce + plugins
|
2011-08-12 13:25:34 +02:00 |
|
did
|
a0293b161b
|
add a new plugin in tinymce to upload any kind of files (Bernd)
|
2011-06-21 05:47:11 -07:00 |
|
Andrea Frigido
|
67dd6304e0
|
Tiny_mce and inline_edit italian localization.
|
2011-05-04 18:57:01 +02:00 |
|
Bernd Hauser
|
32701d7894
|
german language added
|
2011-02-23 12:40:56 +01:00 |
|
Raphael Costa
|
eaab196d06
|
Brazilian Portuguese Translations
|
2011-02-11 23:44:35 -02:00 |
|
dinedine
|
9533df3e43
|
clean up stuff in js + do not display the internal asset collection in the assets section + fix ui bug with custom fields in the assets section
|
2010-09-15 17:48:10 +02:00 |
|
dinedine
|
f458716c8a
|
clean new tinymce image plugin
|
2010-09-15 02:21:46 +02:00 |
|
dinedine
|
2e4a15a511
|
new image plugin for tinymce
|
2010-09-15 02:19:34 +02:00 |
|
dinedine
|
d5223e5c91
|
skinning tinymce to match locomotive style
|
2010-09-06 23:47:03 +02:00 |
|
dinedine
|
6d45155b2f
|
rich text editor for the Text custom field + refactor the custom field types + add new custom field type: Boolean + fix asset collections
|
2010-06-22 15:04:40 +02:00 |
|