Skip to content
Commits on Mar 2, 2013
  1. Restored production email setup

    committed Mar 3, 2013
  2. Seed data for proposals

    Conflicts:
    
    	db/seeds.rb
    committed Mar 3, 2013
  3. Added gem 'impressionist'

    Conflicts:
    
    	Gemfile
    	Gemfile.lock
    committed Mar 3, 2013
  4. Impression counters, showing on idea page, allowing sorting idea-list…

    … by it
    
    Conflicts:
    
    	app/assets/stylesheets/pages.css.scss
    committed Jan 19, 2013
Commits on Mar 1, 2013
  1. Merge branch 'initial_tour'

    Conflicts:
    	app/assets/stylesheets/pages.css.scss
    	app/views/ideas/show.html.haml
    	app/views/pages/_headline.html.haml
    	app/views/pages/home.html.haml
    committed Mar 1, 2013
  2. Merge branch 'proposal_carousel'

    Conflicts:
    	app/assets/stylesheets/application.css.scss
    	app/assets/stylesheets/pages.css.scss
    	app/controllers/pages_controller.rb
    	app/views/pages/_drafts.html.haml
    committed Mar 1, 2013
Commits on Feb 28, 2013
  1. Merge branch 'master' of github.com:RajRoR/avoinministerio

    Conflicts:
    	Gemfile
    	Gemfile.lock
    committed Mar 1, 2013
  2. Merge branch 'fb_signup_flow'

    committed Mar 1, 2013
  3. Merge branch 'stamp_n_state'

    committed Mar 1, 2013
  4. Merge branch 'wc_email'

    committed Mar 1, 2013
  5. Merge branch 'smtp_setup'

    committed Mar 1, 2013
  6. Merge branch 'wrong_cred_msg'

    Conflicts:
    	app/assets/stylesheets/application.css.scss
    	app/views/citizens/sessions/new.html.erb
    committed Mar 1, 2013
  7. Merge branch 'remember_me_btn'

    Conflicts:
    	app/assets/stylesheets/application.css.scss
    committed Mar 1, 2013
  8. Merge branch 'reset_pwd'

    Conflicts:
    	app/assets/stylesheets/application.css.scss
    committed Mar 1, 2013
Commits on Feb 27, 2013
  1. @naleksi

    Merged ArturG/testing

    naleksi committed Feb 27, 2013
  2. @naleksi
  3. @wasimakram @naleksi
Commits on Feb 26, 2013
  1. @naleksi
Commits on Feb 16, 2013
  1. @naleksi

    Merged wasimakram/surveys

    naleksi committed Feb 16, 2013
Commits on Feb 14, 2013
  1. @naleksi

    Merge pull request #335 from naleksi/master

    Rails update 3.2.12
    naleksi committed Feb 14, 2013
  2. @naleksi

    Rails update 3.2.12

    naleksi committed Feb 14, 2013
Commits on Feb 4, 2013
  1. UI Formatting

    committed Feb 4, 2013
Commits on Jan 30, 2013
  1. Added tour on idea show page

    committed Jan 31, 2013
  2. Modified raphel bar text

    committed Jan 31, 2013
Commits on Jan 28, 2013
  1. Moved styles to css files

    Conflicts:
    
    	app/views/shared/_login_actions.html.haml
    
    Conflicts:
    
    	app/assets/stylesheets/application.css.scss
    	app/views/citizens/sessions/new.html.erb
    	app/views/shared/_login_actions.html.haml
    committed Dec 5, 2012
  2. Moved styles to css files

    Conflicts:
    
    	app/views/shared/_login_actions.html.haml
    
    Conflicts:
    
    	app/assets/stylesheets/application.css.scss
    	app/views/citizens/sessions/new.html.erb
    committed Dec 5, 2012
  3. Moved styles to css files

    Conflicts:
    
    	app/views/shared/_login_actions.html.haml
    committed Dec 5, 2012
  4. Flash message on wrong creds, Forget password functionality

    Conflicts:
    
    	app/assets/stylesheets/application.css.scss
    	app/assets/stylesheets/pages.css.scss
    	app/views/citizens/sessions/new.html.erb
    committed Dec 3, 2012
  5. Reset password link

    committed Dec 2, 2012
  6. Remember me button fix

    committed Dec 2, 2012
  7. Fixed branching issues

    Conflicts:
    
    	app/views/pages/_drafts.html.haml
    committed Jan 27, 2013
Something went wrong with that request. Please try again.