github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
engine/app/views/locomotive
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
..
accounts remove references to foldable_inputs and custom_input 2011-11-28 06:40:25 -08:00
content_assets no more flash uploader only HTML5 goodness 2011-12-07 07:10:21 -08:00
content_entries implement feature #324 2012-03-14 01:16:01 +01:00
content_types the has_many ui component is done 2012-02-02 16:53:26 +01:00
current_site the has_many ui component is done 2012-02-02 16:53:26 +01:00
custom_fields performance improvements as described in #383 2012-04-26 03:39:23 +02:00
devise_mailer working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
errors isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext 2011-11-01 00:44:23 +01:00
installation ask for default site locale when creating the first site 2012-02-07 01:29:33 +01:00
layouts the has_many ui component is done 2012-02-02 16:53:26 +01:00
mailer working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
memberships polish the new membership page 2011-12-02 23:31:15 +01:00
my_account the has_many ui component is done 2012-02-02 16:53:26 +01:00
notifications fix issue #338 2012-04-13 14:38:00 +02:00
pages Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
passwords working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
public Merge branch 'master' into wildcards 2012-05-22 20:39:30 -04:00
sessions working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
shared performance improvements as described in #383 2012-04-26 03:39:23 +02:00
sites refactoring the snippet forms (wip) 2011-12-05 02:31:34 -08:00
snippets 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
theme_assets add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements 2012-04-16 11:38:32 +02:00