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 |
|
Gil Vandendriessche
|
d665a85591
|
Add sample option on import rake task
|
2012-01-21 16:05:36 +11:00 |
|
did
|
72c2cb2059
|
rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)
|
2011-11-19 15:47:56 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
Alex Sanford
|
c225a8d394
|
Added rake task to create new admin user
|
2011-08-04 13:19:39 -03:00 |
|
did
|
45ff488ae8
|
enhance the rake task which forces to serialize page templates + do not import twice an asset with the same filename
|
2011-07-19 11:49:15 +02:00 |
|
did
|
53a83b5f79
|
fix broken rake task (rebuild_serialized_page_templates)
|
2011-07-18 23:11:22 +02:00 |
|
did
|
72c1ac9454
|
solve minor bugs
|
2011-07-08 15:03:48 +02:00 |
|
did
|
711110a6e0
|
snippets were missing in the export
|
2011-07-07 16:59:50 +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
|
09171555a7
|
fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable)
|
2011-06-25 09:25:31 -07:00 |
|
did
|
87e7ced3c1
|
integrate dragonfly + clean code + fix a js bug when editing a custom field
|
2011-06-20 12:05:12 -07:00 |
|
did
|
ecdb79bb2d
|
removing asset_collections: script + remove references in liquid
|
2011-06-20 04:25:17 -07:00 |
|
did
|
58ab954ec1
|
new task to migrate asset collections to content types
|
2011-06-18 01:31:43 -07:00 |
|
did
|
21ccbb635b
|
removing asset collections
|
2011-06-17 14:32:54 -07:00 |
|
did
|
2ce1fadf52
|
simplify the installation procedure for bushido users
|
2011-05-27 08:19:20 -07:00 |
|