Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

State machine #375

Open
wants to merge 46 commits into
from

Conversation

Projects
None yet
2 participants
Contributor

RajRoR commented Mar 26, 2013

No description provided.

ArturG and others added some commits Jan 21, 2013

Split users on citizens and politicians. Admin panel -> change user r…
…oles. Ideas view -> Politician can adopt the initiative. Politician can manage people who are voted for or against the initiative.
Locations tagging
Merge branch 'tagging' of git://github.com/ArturG/avoinministerio into tagging

Conflicts:
	Gemfile
	Gemfile.lock
Split users on citizens and politicians. Admin panel -> change user r…
…oles. Ideas view -> Politician can adopt the initiative. Politician can manage people who are voted for or against the initiative. File uploading for initiatives.
Merge branch 'helsinki' of git://github.com/ArturG/avoinministerio in…
…to state_machine

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/ideas.js
	app/assets/javascripts/jquery.tokeninput.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/ideas.css.scss
	app/assets/stylesheets/pages.css.scss
	app/assets/stylesheets/token-input-facebook.css
	app/controllers/ideas_controller.rb
	app/models/idea.rb
	app/uploaders/initiative_document_uploader.rb
	app/views/ideas/show.html.haml
	app/views/layouts/application.html.haml
	app/views/shared/_login_actions.html.haml
	config/initializers/carrierwave.rb
	config/routes.rb
	db/schema.rb
Location dependency of states
- Run `rake db:seed` to populate countries-regions-cities into db
- Seeding will take some time, so don't worry
- only Finland has cities for now.
Vote of politicians (table version)
Conflicts:

	app/assets/stylesheets/ideas.css.scss
	app/controllers/ideas_controller.rb
	config/routes.rb
	db/seeds.rb
Tables better view
Conflicts:

	app/assets/stylesheets/ideas.css.scss
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment