5 Commits

Author	SHA1	Message	Date
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	47625dfa17	refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip)	2011-11-25 02:04:42 +01:00
did	6acec074e2	spanish translation (ticket #103)	2011-07-06 00:33:34 +02:00