Commit Graph

564 Commits

Author SHA1 Message Date
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
Juanjo Bazán
3964988bb1 fixes specs
updates investment to have group_id & budget_id
2016-09-05 13:50:25 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +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
rgarcia
9d9bf488fc does not create notifications for blocked or erased users 2016-08-02 20:52:20 +02:00
rgarcia
f21fda0898 fixes pending specs 2016-07-27 16:39:25 +02:00
rgarcia
fa052d990e marks specs as pending 2016-07-27 14:11:08 +02:00
rgarcia
93bfd492d4 marks specs as pending 2016-07-27 13:27:37 +02:00
rgarcia
c42a041d3a fixes specs 2016-07-19 16:20:45 +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
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
Alberto Garcia Cabeza
702cfe13d1 Fixes specs 2016-07-06 14:47:09 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
rgarcia
25ebb325d1 limits maximum number of messages able to send per day 2016-06-16 11:10:26 +02:00
rgarcia
e2689d640c refactors notification helpers 2016-06-15 12:12:56 +02:00
rgarcia
28d12fe55b removes sending individual proposal notifications via email 2016-06-15 10:43:02 +02:00
rgarcia
fd67294075 adds option to receive direct messages 2016-06-14 18:20:36 +02:00
rgarcia
9f19a5d143 adds option to receive email digest 2016-06-14 18:08:27 +02:00
Juanjo Bazán
1a2e9b37a1 improves ballot spec 2016-06-14 14:12:50 +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
fea3aef5bb updates permissions for direct messages 2016-06-09 17:35: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
rgarcia
ad697cd2c1 adds preference to receive proposal notifications 2016-06-06 12:55:33 +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
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
Juanjo Bazán
65e007ef85 Merge pull request #1135 from consul/budget-permissions
Budget permissions
2016-05-30 14:36:47 +02:00
kikito
7005faabe6 adds admin permissions for investments 2016-05-30 14:13:36 +02:00
kikito
2a82e9e33a Redoes the common balloting permissions 2016-05-30 14:01:47 +02:00
kikito
13f43d8b67 Adds valuator investment abilities 2016-05-30 13:55:12 +02:00
kikito
daa8783b02 Adds common Investment abilities 2016-05-30 13:53:30 +02:00
kikito
4dd293f487 Adds a ballot spec for amount_available 2016-05-27 15:11:58 +02:00
kikito
a0b6e99f09 adds specs for budged model 2016-05-27 13:02:48 +02:00
kikito
11a5140cf0 Implements missing specs & removes deprecated ones 2016-05-24 17:40:07 +02:00
kikito
9876583c1a deactivates test 2016-05-24 15:31:23 +02:00
kikito
673cfc8249 Implements some basic budget investment specs 2016-05-24 14:36:45 +02:00
kikito
fdc8636e12 Adds simple Budget specs 2016-05-24 14:33:30 +02:00
Juanjo Bazán
57642075a7 adds ballot model spec 2016-05-24 13:04:12 +02:00
MaiteHdezRivas
3b2bfc46cf Admin option to add banners and show banners 2016-05-19 13:18:30 +02:00
Juanjo Bazán
d1e50d70d6 managers can login to /management 2016-05-10 19:10:02 +02:00
rgarcia
d51fe779e2 displays summary info for supported spending proposals 2016-04-26 15:13:53 +02:00