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 |
|
Pietro Giorgianni
|
6d08daaba3
|
Fix i18n files so that they don't make Psych angry.
(Fixes #269)
|
2012-01-10 15:00:07 +01:00 |
|
did
|
e9ef4d48c3
|
content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API
|
2011-12-23 00:45:32 +01:00 |
|
did
|
3c31c8dbcf
|
remove all the references to asset_collections
|
2011-06-21 06:12:20 -07:00 |
|
did
|
91119bf54e
|
allow administrators to change the text displayed for each content in the back-office (documentation is coming)
|
2011-06-01 23:43:12 +02:00 |
|
Andrea Frigido
|
67dd6304e0
|
Tiny_mce and inline_edit italian localization.
|
2011-05-04 18:57:01 +02:00 |
|
Andrea Frigido
|
bee4f01e56
|
Italian localization.
|
2011-05-04 13:05:16 +02:00 |
|