Alex Sanford 7dcc1ba3f6 Merge branch 'master' into api_auth ... Conflicts: features/step_definitions/api_steps.rb		2012-04-24 13:22:35 -03:00
..
assets	the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office	2012-04-22 23:25:18 +02:00
cells/locomotive	API access for the current site + easy way to specify the localization of any controllers + fix a minor bug about adding/removing domains	2012-02-09 11:36:10 +01:00
controllers/locomotive	Merge branch 'master' into api_auth	2012-04-24 13:22:35 -03:00
helpers/locomotive	it is now possible to change the response type of a page + correct translations in French	2012-03-22 19:20:31 +01:00
inputs/locomotive	alpha version of the upgrade script (good results with my existing locomotive sites) + fix bugs according to my tests with my existing live websites + remove useless code (polishing)	2012-02-20 01:15:43 +01:00
mailers/locomotive	fix tests for issue #366	2012-04-17 03:02:31 +02:00
models/locomotive	fix issue #367	2012-04-20 00:31:48 +02:00
presenters/locomotive	simple media plugin for Aloha	2012-04-22 01:14:25 +02:00
uploaders/locomotive	fix some bugs + refactor look and feel of the import screens (wip)	2011-12-08 07:47:17 -08:00
views/locomotive	simple media plugin for Aloha	2012-04-22 01:14:25 +02:00