github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/app
History
Marko Iskander 02ea6913e3 Merge branch 'master' into wildcards 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/locomotive/models/page.js.coffee
	app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee
	app/models/locomotive/extensions/site/locales.rb
	app/models/locomotive/page.rb
	app/views/locomotive/pages/_form.html.haml
	config/initializers/haml.rb
	config/locales/default.ru.yml
	config/locales/formtastic.ru.yml
	doc/TODO
	lib/locomotive/haml.rb
	script/upgrade_v1.rb
	spec/dummy/config/initializers/haml.rb
 		2012-05-22 20:39:30 -04:00
..
assets Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04: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 wildcards 2012-05-22 20:39:30 -04:00
helpers/locomotive Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04: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 Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
presenters/locomotive Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04: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 Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00