engine/lib/locomotive
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
..
action_controller refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
carrierwave theme assets page in progress 2011-12-07 02:09:13 +01:00
httparty namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
import Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-15 00:02:46 +10:30
liquid bad display of content types if none + add new gems for tinymce and aloha 2012-01-21 01:48:00 +01:00
middlewares use the right path to the back-office in the js components as well as in the middlewares 2012-01-14 14:54:01 +01:00
mongoid add the ui element to select the languages for a site 2012-01-09 17:24:34 -08:00
routing polishing the current site editing screen (wip) 2011-11-29 02:24:02 +01:00
action_controller.rb refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
carrierwave.rb clean everything before merging it to the master branch 2011-06-10 01:04:13 +02:00
configuration.rb Merge remote-tracking branch 'origin/master' into rails_3_1 2012-01-25 22:16:43 +11:00
core_ext.rb fix various namespace errors issues and api changes for the models 2011-11-10 13:41:20 -08:00
custom_fields.rb 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
delayed_job.rb fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
dependencies.rb bad display of content types if none + add new gems for tinymce and aloha 2012-01-21 01:48:00 +01:00
devise.rb use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
dragonfly.rb write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
engine.rb bad display of content types if none + add new gems for tinymce and aloha 2012-01-21 01:48:00 +01:00
export.rb 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
formtastic.rb use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
httparty.rb 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
import.rb fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
kaminari.rb fix issue #243 (Kaminari causing error on Bushido) 2011-11-05 15:18:15 +01:00
liquid.rb refactor locomotive liquid drops + implement the theme or site import page (95% done) 2010-09-29 00:08:11 +02:00
logger.rb write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
middlewares.rb refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
mongoid.rb implement the mechanism to pick a different locale for content types + implement multi-language for content types + rename scss files to css.scss 2012-01-14 01:38:09 +01:00
regexps.rb Added a redirect page extension, integrated into the application and added new tests 2011-01-06 22:48:41 +08:00
render.rb inline editor work in progress 2012-01-17 12:05:39 +01:00
routing.rb Upgrading to Rails3 rc 2010-07-29 16:21:48 -07:00
session_store.rb working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
version.rb trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00