did
|
fa36b95a9d
|
get rid of warnings about InstanceMethods (deprecated) + make the engine work smoother with an existing app + clean code
|
2012-02-06 00:54:09 +01:00 |
|
did
|
c5692aeb2a
|
fix errors when deploying a new brand new engine instance
|
2012-01-27 02:27:26 +01: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 |
|
did
|
dd75f69b74
|
fix module collisions and missing namespaces all over the templates (wip)
|
2011-11-08 01:11:15 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |