State machine #375

Open
wants to merge 46 commits into
from
Commits on Feb 9, 2013
  1. Indication of possible tags and duplicates when adding an idea. Appro…

    ArturG committed Jan 21, 2013
    …ved/Proposed tags for and idea.
  2. gemfile update

    ArturG committed Feb 9, 2013
Commits on Feb 19, 2013
  1. Ideas views fix

    ArturG committed Feb 19, 2013
Commits on Feb 20, 2013
  1. Show all tags action + popup

    ArturG committed Feb 20, 2013
  2. Quickfix

    ArturG committed Feb 20, 2013
Commits on Feb 22, 2013
  1. Split users on citizens and politicians. Admin panel -> change user r…

    ArturG committed Feb 21, 2013
    …oles. Ideas view -> Politician can adopt the initiative. Politician can manage people who are voted for or against the initiative.
  2. Preparations for file uploader

    ArturG committed Feb 22, 2013
Commits on Feb 23, 2013
  1. Locations tagging

    RajRoR committed Feb 23, 2013
    Merge branch 'tagging' of git://github.com/ArturG/avoinministerio into tagging
    
    Conflicts:
    	Gemfile
    	Gemfile.lock
  2. Added secret_token.rb

    RajRoR committed Feb 23, 2013
  3. Pg compatible query

    RajRoR committed Feb 23, 2013
  4. Show all possible tags

    RajRoR committed Feb 23, 2013
Commits on Feb 24, 2013
  1. Split users on citizens and politicians. Admin panel -> change user r…

    ArturG committed Feb 21, 2013
    …oles. Ideas view -> Politician can adopt the initiative. Politician can manage people who are voted for or against the initiative. File uploading for initiatives.
  2. PDF reader

    ArturG committed Feb 24, 2013
Commits on Feb 25, 2013
  1. Tagging merge

    ArturG committed Feb 25, 2013
  2. Locations

    ArturG committed Feb 25, 2013
  3. Css fix

    ArturG committed Feb 25, 2013
  4. Locations seed

    ArturG committed Feb 25, 2013
  5. Idea/show fix

    ArturG committed Feb 25, 2013
  6. Merge branch 'helsinki' of git://github.com/ArturG/avoinministerio in…

    RajRoR committed Feb 25, 2013
    …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
  7. Seed data changes for states

    RajRoR committed Feb 25, 2013
  8. Seed.rb

    RajRoR committed Feb 25, 2013
  9. State localization fix

    RajRoR committed Feb 25, 2013
Commits on Feb 26, 2013
  1. Location dependency of states

    RajRoR committed Feb 26, 2013
    - 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.
  2. Dynamic state image

    RajRoR committed Feb 26, 2013
  3. Seed ideas for Helsinki

    RajRoR committed Feb 26, 2013
  4. Removed bang bang bang

    RajRoR committed Feb 26, 2013
  5. Region ISO fix

    RajRoR committed Feb 26, 2013
  6. State order by rank

    RajRoR committed Feb 26, 2013
Commits on Feb 27, 2013
  1. Filtering by dynamic states

    RajRoR committed Feb 27, 2013
  2. Vote of politicians (table version)

    ArturG authored and RajRoR committed Feb 27, 2013
    Conflicts:
    
    	app/assets/stylesheets/ideas.css.scss
    	app/controllers/ideas_controller.rb
    	config/routes.rb
    	db/seeds.rb
  3. Updated schema.rb

    RajRoR committed Feb 27, 2013
  4. Cleanup

    ArturG authored and RajRoR committed Feb 27, 2013
  5. Tables better view

    ArturG authored and RajRoR committed Feb 27, 2013
    Conflicts:
    
    	app/assets/stylesheets/ideas.css.scss
  6. Quick css fix

    ArturG authored and RajRoR committed Feb 27, 2013
  7. Css

    ArturG authored and RajRoR committed Feb 27, 2013
  8. From symbolic filter to string

    RajRoR committed Feb 27, 2013
  9. Sample ideas

    RajRoR committed Feb 27, 2013
Commits on Feb 28, 2013