Commit Graph

909 Commits

Author SHA1 Message Date
rgarcia
8e12fbdd55 adds time limit between notifications 2016-06-07 13:48:09 +02:00
kikito
118b9c843d Activates budget in seeds for tests 2016-06-07 11:09:57 +02:00
rgarcia
ad697cd2c1 adds preference to receive proposal notifications 2016-06-06 12:55:33 +02:00
kikito
d57a6c510f Activates budget setting in dev_seeds 2016-06-03 18:31:05 +02:00
Juanjo Bazán
e4a7989b15 Merge branch 'master' into budget 2016-06-02 12:35:44 +02:00
rgarcia
f5375e813d stores a proposal notification 2016-06-01 17:23:56 +02:00
kikito
0427395f32 Adds missing currency symbol to dev_seeds 2016-05-31 18:58:50 +02:00
kikito
56f5983dc4 Adds budget dev_seeds 2016-05-31 12:53:11 +02:00
kikito
2409cccd8f Adds budget.price and ballot.heading_id 2016-05-24 17:38:41 +02:00
kikito
d4d16d3006 Adds responsible_name migration for investments 2016-05-24 14:34:04 +02:00
kikito
20108639cb migrates 2016-05-24 14:34:04 +02:00
kikito
cf0b7a53b0 Adds missing budget_id to investments 2016-05-24 14:33:30 +02:00
Juanjo Bazán
c48059594b removes belongs_to :heading relation from ballot 2016-05-24 13:04:12 +02:00
Juanjo Bazán
7c22c9d6fa changes texts to english 2016-05-23 19:53:36 +02:00
Juanjo Bazán
6614f365cc fixes indentation 2016-05-23 19:53:09 +02:00
Alberto Garcia Cabeza
5c166dc8ee Removes old schema tables 2016-05-23 16:53:53 +02:00
Alberto Garcia Cabeza
cdf3011a45 Fixes dev seeds 2016-05-23 16:53:36 +02:00
Alberto Garcia Cabeza
8954ea6cb5 Improves styles, removes blank spaces and changes banners img 2016-05-23 16:49:40 +02:00
kikito
f1b8ba0457 Adds headings via migrations 2016-05-20 14:06:32 +02:00
kikito
40ae4efe26 Adds migrations 2016-05-20 12:40:52 +02:00
MaiteHdezRivas
550f61ed51 Merge with consul 2016-05-19 13:55:25 +02:00
MaiteHdezRivas
3b2bfc46cf Admin option to add banners and show banners 2016-05-19 13:18:30 +02:00
Juanjo Bazán
9ed3fa2a22 creates manager role 2016-05-10 18:31:50 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
rgarcia
aaca99b46f orders valuators by spending proposal count 2016-04-26 23:33:19 +02:00
Juanjo Bazán
66dd511979 Merge pull request #1041 from consul/select-featured-debates
Select featured debates
2016-04-25 18:19:40 +02:00
Juanjo Bazán
479b48796f Merge pull request #1085 from consul/retire-proposals
Retire proposals
2016-04-25 18:00:34 +02:00
Juanjo Bazán
32f971f0ad Merge pull request #1084 from consul/spending-proposals-summary
Spending proposals admin summary
2016-04-25 11:29:07 +02:00
Juanjo Bazán
a49624b6ad adds social settings to dev_seeds 2016-04-24 21:56:43 +02:00
Juanjo Bazán
be011a10dc adds retired reason & explanation to proposals 2016-04-23 13:24:15 +02:00
Juanjo Bazán
69d2c14b49 adds retired_at to proposals 2016-04-23 13:24:15 +02:00
rgarcia
6a4177ed59 updates dev seeds 2016-04-22 15:03:50 +02:00
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
palomahnhp
b4ec077f16 Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others
Conflicts:
	app/assets/javascripts/application.js
2016-04-20 11:28:06 +02:00
kikito
d752a334f8 adds index for username 2016-04-19 13:33:52 +02:00
rgarcia
f2e0059c96 activates newsletter by default 2016-04-18 19:58:01 +02:00
Juanjo Bazán
fc0ea93cef adds setting to dev_seeds 2016-04-17 10:55:42 +02:00
Juanjo Bazán
5a785ca7ce adds voting on sps as admin feature flag 2016-04-15 17:57:02 +02:00
kikito
3adcd9c304 Adds physical votes to sps table 2016-04-15 17:16:13 +02:00
kikito
ba67396539 Adds migration for renaming genre to gender 2016-04-13 14:25:14 +02:00
kikito
3b754fd998 Adds two new fields to user 2016-04-11 18:28:28 +02:00
Juanjo Bazán
3087b2dac9 changes default order in valuation/sps to votes up 2016-04-11 16:12:03 +02:00
kikito
3c8416e863 Adds responsible_name to spending_proposals 2016-04-06 19:18:10 +02:00
Juanjo Bazán
c71d09d3df adds verified and level 2 users to dev_seeds 2016-04-06 12:29:50 +02:00
Alberto Garcia Cabeza
3fd8e76a79 Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
Conflicts:
	db/schema.rb
2016-04-05 14:05:27 +02:00
Bertocq
f18a1778ff Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul 2016-04-04 20:56:29 +02:00
Juanjo Bazán
6649b0fbdd adds default value for cached_votes_up 2016-03-30 11:47:40 +02:00
Juanjo Bazán
cb681883f8 adds pg_search to spending proposals 2016-03-30 10:59:27 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
rgarcia
467c06c3ca allows unfeasible emails only to be send out once 2016-03-28 18:06:43 +02:00