Commit Graph

36 Commits

Author SHA1 Message Date
Didier Lafforgue dae0b665ac script to upgrade from 1.0. to 2.0 (wip) 2012-02-19 10:38:56 +01:00
Didier Lafforgue 085a54d7c1 introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine 2012-02-17 00:51:33 +01:00
Didier Lafforgue 64a050dff9 fixing specs (wip) + cell specs are fine 2012-02-16 01:32:37 +01:00
did b93c7f8f51 remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc) 2012-01-28 12:41:00 +01:00
did 50917a919e Use the 2.0.0.rc branch for the custom_fields gem 2012-01-26 02:41:31 +01:00
did 4600f94922 extend i18n to pages (wip) 2012-01-25 22:07:10 +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
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 c8f0ad0bbe upgrade rake (0.9.2), cucumber-rails (1.0.2), capybara 2011-06-29 03:05:07 +02:00
did 8c1372afc6 fixing the heroku version 2011-06-28 17:35:25 +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
Sean Grove d557af74ea Typo 2011-05-30 14:32:34 -07:00
Sean Grove 6834e6db85 Tweaks to match the Bushido Events api 2011-05-30 14:17:42 -07:00
did dfb4ed48bc refactor bushido message to event 2011-05-29 15:25:36 -07:00
did ef7ac0e721 make the bushido installation process the smoothest 2011-05-27 15:14:45 -07:00
did 2ce1fadf52 simplify the installation procedure for bushido users 2011-05-27 08:19:20 -07:00
Sean Grove b70685a2bd Add bushido rake tasks 2011-03-21 02:40:37 -07:00
Jacques Crocker a09329c030 Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable 2010-07-23 13:09:54 -07:00
dinedine a0216dc75f first cucumber features + crud for pages (95% done) 2010-05-09 14:44:53 +02:00
dinedine 0db6b9625f add cucumber to the projet (waiting for the first scenari) 2010-04-13 01:33:25 +02:00
dinedine ff6fcf43f1 clean code + rspec works smoothly now 2010-04-09 14:03:54 +02:00
dinedine 4e16509531 current testing context 2010-04-09 12:22:38 +02:00
dinedine cd67a29b88 working stack ? 2010-04-09 11:23:41 +02:00
dinedine a9fb66f9c1 first init 2010-03-30 00:01:47 +02:00