Commit Graph

36 Commits

Author SHA1 Message Date
Didier Lafforgue 655fe18d72 add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements 2012-04-16 11:38:32 +02:00
Didier Lafforgue 37374207e8 wrong spaces in one of the locale yml files 2012-03-12 03:21:28 +01:00
Paul Sponagl fa9cbe2276 Neuer -> Neue 2012-03-09 16:26:19 +01:00
Paul Sponagl ca4640addb Final German translation 2012-03-09 16:20:03 +01:00
Didier Lafforgue fcf32f9d53 update deutch translations 2012-03-03 11:23:39 +01:00
Mario Visic e849318cc4 Fixed a few remaining typos. 2012-01-25 22:24:36 +11:00
Mario Visic 840609cbce Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
	Gemfile
	Gemfile.lock
	app/cells/locomotive/menu_cell.rb
	app/helpers/admin/content_types_helper.rb
	app/models/content_instance.rb
	app/models/page.rb
	app/views/admin/shared/menu/_contents.html.haml
	config/initializers/locomotive.rb
	config/locales/admin_ui.de.yml
	config/locales/admin_ui.en.yml
	config/locales/admin_ui.es.yml
	config/locales/admin_ui.fr.yml
	config/locales/admin_ui.it.yml
	config/locales/admin_ui.nl.yml
	config/locales/admin_ui.no.yml
	config/locales/admin_ui.pt-BR.yml
	config/locales/admin_ui.ru.yml
	lib/generators/locomotive/install/templates/locomotive.rb
	lib/locomotive/configuration.rb
	locomotive_cms.gemspec
	spec/models/locomotive/account_spec.rb
2012-01-25 22:16:43 +11:00
Corey Woodcox 81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00
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
benni 00035287c3 Update german locales (admin_ui and formtastic)
Conflicts:

	config/locales/admin_ui.de.yml
	config/locales/formtastic.de.yml
2012-01-14 23:19:57 +10:30
benni edc1907cfa Fixed i18n bug in german locale when creating a new resource from api. 2012-01-14 23:13:18 +10:30
Mario Visic 75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
	Gemfile
	Gemfile.lock
	features/support/env.rb
	locomotive_cms.gemspec
	spec/cells/locomotive/global_actions_spec.rb
	spec/cells/locomotive/main_menu_cell_spec.rb
	spec/cells/locomotive/settings_menu_cell_spec.rb
2012-01-14 16:37:24 +10:30
Paul Sponagl df10701746 added translations af bennibu 2012-01-04 17:43:47 +01:00
Paul Sponagl dc324893ce german translation additions 2012-01-04 14:12:41 +01:00
did 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -08: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 368f643cf0 theme assets page in progress 2011-12-07 02:09:13 +01:00
did 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
Sharagoz a843f16be0 norwegian locale 2011-09-19 17:43:23 +02:00
Sharagoz c6ab499664 added norwegian locale 2011-09-19 15:48:43 +02:00
did 6a2f0f17dd complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales 2011-08-31 23:43:52 +02:00
did 67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07:00
did 37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
did 6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00
did 0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
did 1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did 02186d7368 add the export link + fix the bugs for the export module + a little bit of refactoring 2011-07-04 15:25:02 +02:00
did 2cc07b3957 fix a little typo in the locales 2011-06-23 07:44:14 -07:00
did 3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
Andrea Frigido bee4f01e56 Italian localization. 2011-05-04 13:05:16 +02:00
did 2942ce58c8 merged manually pull request #62: extended german language 2011-04-27 16:58:58 +02:00
did 551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
did a2ea522964 clean translations (a part of it moved to the CustomFields gem) + refactor the custom fields form (mustache) as well as enhance the ui/look&feel + fix some bugs related to the creation/edition of content types and contents 2011-03-05 00:29:40 +01:00
did 2cb498bc50 added the German translation for the footer (thanks Estelle ;-)) 2011-02-27 12:32:57 +01:00
did abcc61a8e6 add the missing index view for theme assets + update the 2 locomotive.rb files (generator + default) 2011-02-27 12:18:48 +01:00
Bernd Hauser 32701d7894 german language added 2011-02-23 12:40:56 +01:00