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 |
|
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
|
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
|
2942ce58c8
|
merged manually pull request #62: extended german language
|
2011-04-27 16:58:58 +02:00 |
|
did
|
537c1a6f67
|
clean translations (password, new_password) + provide a right tab background longer for the menu
|
2011-03-05 01:10:52 +01:00 |
Bernd Hauser
|
32701d7894
|
german language added
|
2011-02-23 12:40:56 +01:00 |