palomahnhp bf5d253e12 Merge branch 'master' into tracking_user_verifications_and_others ...

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

2016-04-20 11:44:33 +02:00

..

controllers

remove controller test for management proposals friendly urls

2016-03-02 16:01:07 +01:00

features

Merge branch 'master' into tracking_user_verifications_and_others

2016-04-20 11:44:33 +02:00

helpers

changes links in 'My activity' to point to comment

2016-03-14 18:23:09 +01:00

lib

Modifies census_api to parse genre and dob

2016-04-12 18:18:25 +02:00

mailers

Store locale in a user's field and switch locale on mailers

2016-01-22 18:10:28 +01:00

models

add spec for user identity erasure

2016-04-19 13:33:52 +02:00

support

shows voting button for sps only if voting allowed

2016-04-18 12:04:50 +02:00

factories.rb

creates new fields and assignments for spending_ps

2016-02-24 18:52:15 +01:00

i18n_spec.rb

Adds i18n-tasks

2015-08-06 18:31:26 +02:00

rails_helper.rb

disables js fx in specs via poltergeist config

2016-03-04 12:26:47 +01:00

spec_helper.rb

Configures tests to minimize flackyness

2016-02-24 11:37:07 +01:00