github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
wildcards
engine/app/controllers/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
..
api the content_entries API returns always a flat list of entries + fix a bug about cycling dependencies when the content_type has a field named source 2012-03-07 02:56:56 +01:00
public write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it 2012-04-17 17:48:42 +02:00
accounts_controller.rb remove references to foldable_inputs and custom_input 2011-11-28 06:40:25 -08:00
base_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
content_assets_controller.rb no more flash uploader only HTML5 goodness 2011-12-07 07:10:21 -08:00
content_entries_controller.rb 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
content_types_controller.rb change the location url for the API responses + force the use of the default site locale when creating a new entry, content type or page 2012-01-26 07:51:32 -08:00
current_site_controller.rb fix ALL the cucumber tests + also solve a couple of UI bugs with the has_many and many_to_many relationships 2012-03-01 11:07:22 +01:00
installation_controller.rb ask for default site locale when creating the first site 2012-02-07 01:29:33 +01:00
memberships_controller.rb remove references to foldable_inputs and custom_input 2011-11-28 06:40:25 -08:00
my_account_controller.rb working on the screen for editing my account 2011-12-01 15:04:45 -08:00
pages_controller.rb refactoring (wip) 2012-04-06 12:23:11 +02:00
passwords_controller.rb remove references to foldable_inputs and custom_input 2011-11-28 06:40:25 -08:00
sessions_controller.rb change the location url for the API responses + force the use of the default site locale when creating a new entry, content type or page 2012-01-26 07:51:32 -08:00
sites_controller.rb refactoring of the import UI is done 2011-12-11 23:33:38 +01:00
snippets_controller.rb 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_controller.rb theme assets page in progress 2011-12-07 02:09:13 +01:00