Commit Graph

3951 Commits

Author SHA1 Message Date
rgarcia
9f19a5d143 adds option to receive email digest 2016-06-14 18:08:27 +02:00
rgarcia
6e800c5120 adds email digest for proposal notifications 2016-06-14 17:53:36 +02:00
Enrique García
a275c24d7f Merge pull request #1147 from consul/ballot-lines-redone
Ballot lines redux
2016-06-14 15:01:34 +02:00
Juanjo Bazán
1a2e9b37a1 improves ballot spec 2016-06-14 14:12:50 +02:00
Juanjo Bazán
1b57e14a86 removes heading reference in ballot
heading info is stored per group in ballot_lines
2016-06-14 14:04:27 +02:00
Juanjo Bazán
4fcf138045 refactors investment adding to ballots 2016-06-14 14:03:21 +02:00
rgarcia
0fba15b1e5 Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications 2016-06-13 16:13:22 +02:00
rgarcia
9b1be8da19 adds direct message specs 2016-06-13 12:33:59 +02:00
rgarcia
143089603c fixes specs 2016-06-13 12:33:46 +02:00
Juanjo Bazán
56a358a638 adds funds and feasibility validations to lines 2016-06-11 15:01:51 +02:00
Juanjo Bazán
ab008ed4e9 adds denormalization to budget::ballot::lines 2016-06-11 14:57:07 +02:00
Alberto Garcia Cabeza
a417d88f91 Adds proposal notification digest mailer 2016-06-10 18:03:03 +02:00
Alberto Garcia Cabeza
988f1f645a Improves proposal notification mailer and fixes settings.scss 2016-06-10 18:02:37 +02:00
Alberto Garcia Cabeza
29f869046a Adds message for no accepting private messages 2016-06-10 18:01:59 +02:00
Enrique García
e849357e57 Merge pull request #1144 from consul/groups-model
adds Budget::Group model to group headings
2016-06-10 11:40:47 +02:00
Juanjo Bazán
b5a6828e41 adds Budget::Group model to group headings
many refactors through budget related models
2016-06-09 18:00:06 +02:00
rgarcia
00fc5b77e5 adds permissions in view for direct messages 2016-06-09 17:42:13 +02:00
rgarcia
fea3aef5bb updates permissions for direct messages 2016-06-09 17:35:19 +02:00
Alberto Garcia Cabeza
900d997000 Adds message for unverified users 2016-06-09 17:15:11 +02:00
Alberto Garcia Cabeza
15af94928b Adds styles and texts for direct messages mailer 2016-06-09 16:01:38 +02:00
Alberto Garcia Cabeza
999f5bbde3 Improves styles for direct messages 2016-06-09 16:01:03 +02:00
Alberto Garcia Cabeza
ad856521fc Adds translations for direct messages 2016-06-09 16:00:13 +02:00
Raimond Garcia
ab3ba9e191 Merge pull request #1143 from consul/missing-migration
adds missing migration file (external_link)
2016-06-09 14:26:05 +02:00
Juanjo Bazán
a3ffbd77b2 adds missing migration file (external_link) 2016-06-09 13:51:07 +02:00
Juanjo Bazán
3fae269c40 adds missing migration file (external_link) 2016-06-09 13:30:01 +02:00
Alberto Garcia Cabeza
7548b0492d Adds more styles to budget pages 2016-06-09 12:59:55 +02:00
rgarcia
c3d06c8bd0 adds direct messages 2016-06-08 20:44:54 +02:00
Alberto Garcia Cabeza
aa1ed87725 Adds styles for budgets 2016-06-08 19:45:09 +02:00
rgarcia
6bade16ee8 fixes specs 2016-06-08 19:38:38 +02:00
rgarcia
0e86cd89d6 adds permissions with cancan for new, create and show 2016-06-08 13:46:17 +02:00
rgarcia
21c2220626 fixes typo 2016-06-08 12:30:53 +02:00
rgarcia
34304a0b5e fixes conflicts with master 2016-06-07 23:19:01 +02:00
rgarcia
16f10e34ef fixes specs 2016-06-07 23:17:00 +02:00
rgarcia
51f4acef91 Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications 2016-06-07 22:03:29 +02:00
rgarcia
a0ddde16e9 adds notifications for proposals 2016-06-07 22:03:14 +02:00
Alberto Garcia Cabeza
0899a0ddb4 Improves styles for budget index and show views 2016-06-07 19:22:15 +02:00
Alberto Garcia Cabeza
e866d9c2df Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications 2016-06-07 16:12:26 +02:00
Alberto Garcia Cabeza
e550a40f90 Adds share and comment button on email 2016-06-07 16:12:16 +02:00
rgarcia
ea90869114 Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications 2016-06-07 14:05:19 +02:00
rgarcia
43251585b9 pending permissions spec 2016-06-07 13:56:40 +02:00
rgarcia
8e12fbdd55 adds time limit between notifications 2016-06-07 13:48:09 +02:00
kikito
8cc2cd0eb1 Adds investment specs (WIP) 2016-06-07 11:13:08 +02:00
kikito
630a4878a8 Adds a lot of views (WIP) 2016-06-07 11:12:58 +02:00
kikito
43aec952bf Adds route for ballot & ballot lines 2016-06-07 11:12:29 +02:00
kikito
5f5e7b7c07 Adds vote extensions to handle budget_investments 2016-06-07 11:12:11 +02:00
kikito
d1311438e7 Sets the random seed in the investments_controller 2016-06-07 11:11:00 +02:00
kikito
1aa70bec94 Adds method Ballot#has_investment? 2016-06-07 11:10:42 +02:00
kikito
888fb82227 Includes a default unfeasibility_explanation when creating an unfeasible Investment 2016-06-07 11:10:15 +02:00
kikito
118b9c843d Activates budget in seeds for tests 2016-06-07 11:09:57 +02:00
kikito
a9dbc6160a Fixes typo in ApplicationController 2016-06-07 11:09:43 +02:00