Juanjo Bazán
|
8aa62f8ce7
|
Merge branch 'budget' into admin-budgets
|
2016-09-09 15:13:05 +02:00 |
|
Juanjo Bazán
|
0fc31b1259
|
adds budget/budget_investment indexes to valuators
|
2016-09-09 13:39:08 +02:00 |
|
kikito
|
50f82211a9
|
Add User has_many budget_investments
|
2016-09-09 12:20:58 +02:00 |
|
kikito
|
f456400218
|
Removes duplicated relationship between budget and investment
|
2016-09-09 12:17:05 +02:00 |
|
Juanjo Bazán
|
31ef3f4c98
|
adds heading filter to index
|
2016-09-06 17:03:35 +02:00 |
|
Juanjo Bazán
|
6d06a59403
|
uses direct associations when managing investments
|
2016-09-05 13:02:08 +02:00 |
|
rgarcia
|
c2c7cdb18d
|
Merge branch 'budget' into budget-public-controllers
|
2016-09-02 13:15:40 +02:00 |
|
rgarcia
|
3e0786b555
|
Merge branch 'budget' of github.com:AyuntamientoMadrid/participacion into budget
|
2016-09-02 13:15:30 +02:00 |
|
Juanjo Bazán
|
b8b71d0ab0
|
Merge branch 'master' into budget
|
2016-09-02 12:47:54 +02:00 |
|
Juanjo Bazán
|
46563f8222
|
Merge pull request #1194 from consul/notifications-polish
Notifications polish
|
2016-08-04 11:29:21 +02:00 |
|
Juanjo Bazán
|
0f7e23bec4
|
adds budget's groups & headings to admin
|
2016-08-03 20:23:41 +02:00 |
|
rgarcia
|
b087fe8fb7
|
refactors email digest
|
2016-08-03 19:33:37 +02:00 |
|
rgarcia
|
9d9bf488fc
|
does not create notifications for blocked or erased users
|
2016-08-02 20:52:20 +02:00 |
|
Juanjo Bazán
|
49bc6533e8
|
adds explicit permission to admin to read budgets
|
2016-07-29 13:39:08 +02:00 |
|
Juanjo Bazán
|
9014de2693
|
adds budgets_helper
|
2016-07-29 13:34:11 +02:00 |
|
Juanjo Bazán
|
baddfdb3d1
|
adds phase scopes to budget
|
2016-07-28 12:35:22 +02:00 |
|
rgarcia
|
f21fda0898
|
fixes pending specs
|
2016-07-27 16:39:25 +02:00 |
|
rgarcia
|
464673a7aa
|
creates setter association for budget investments
|
2016-07-27 13:04:52 +02:00 |
|
rgarcia
|
3c55d66591
|
fixes conflicts with budget
|
2016-07-27 11:41:46 +02:00 |
|
rgarcia
|
1587222cba
|
tmp commit
|
2016-07-20 14:06:27 +02:00 |
|
rgarcia
|
a23666683f
|
fixes conflicts with master
|
2016-07-19 15:50:22 +02:00 |
|
rgarcia
|
f24a8887bb
|
fixes conflicts with master
|
2016-07-19 14:49:27 +02:00 |
|
rgarcia
|
85d9dd4b84
|
integrates cancan with budgets
|
2016-07-19 14:41:55 +02:00 |
|
rgarcia
|
9e910a834b
|
Displays badge for official positions
|
2016-06-20 21:37:25 +02:00 |
|
rgarcia
|
8ee7d535ba
|
generic message for max_per_day setting
|
2016-06-16 15:54:19 +02:00 |
|
rgarcia
|
25ebb325d1
|
limits maximum number of messages able to send per day
|
2016-06-16 11:10:26 +02:00 |
|
kikito
|
0c469bc362
|
fixes the way permissions work for proposalnotifications
|
2016-06-15 14:02:13 +02:00 |
|
rgarcia
|
e2689d640c
|
refactors notification helpers
|
2016-06-15 12:12:56 +02:00 |
|
rgarcia
|
6e800c5120
|
adds email digest for proposal notifications
|
2016-06-14 17:53:36 +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 |
|
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 |
|
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 |
|
rgarcia
|
c3d06c8bd0
|
adds direct messages
|
2016-06-08 20:44:54 +02:00 |
|
rgarcia
|
0e86cd89d6
|
adds permissions with cancan for new, create and show
|
2016-06-08 13:46:17 +02:00 |
|
rgarcia
|
16f10e34ef
|
fixes specs
|
2016-06-07 23:17:00 +02:00 |
|
rgarcia
|
a0ddde16e9
|
adds notifications for proposals
|
2016-06-07 22:03:14 +02:00 |
|
rgarcia
|
8e12fbdd55
|
adds time limit between notifications
|
2016-06-07 13:48:09 +02:00 |
|
kikito
|
1aa70bec94
|
Adds method Ballot#has_investment?
|
2016-06-07 11:10:42 +02:00 |
|
rgarcia
|
fc6cc090f8
|
displays notifications in proposal view
|
2016-06-06 12:21:48 +02:00 |
|
kikito
|
c6c3e22a40
|
Adds methods for investments in models
|
2016-06-03 18:44:34 +02:00 |
|
Juanjo Bazán
|
e4a7989b15
|
Merge branch 'master' into budget
|
2016-06-02 12:35:44 +02:00 |
|
rgarcia
|
ca26b3423b
|
sends notification email to each voter
|
2016-06-01 21:40:23 +02:00 |
|
rgarcia
|
f5375e813d
|
stores a proposal notification
|
2016-06-01 17:23:56 +02:00 |
|
Andrés Pereira
|
24a9d77e64
|
Custom folder structure: verification residence for Madrid
|
2016-05-31 19:57:37 +02:00 |
|
Andrés Pereira
|
a4dbd768ce
|
Custom folder structure: initial documentation, code and structure folders
|
2016-05-31 19:57:29 +02:00 |
|
kikito
|
fa6f34bf5c
|
Adds basic Budget controller / views
|
2016-05-31 19:26:56 +02:00 |
|