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 |
|
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
|
5d271239b7
|
the screen for editing site has been refactored
|
2011-11-29 14:58:19 +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 |
|