Commit Graph

6051 Commits

Author SHA1 Message Date
Juanjo Bazán
46563f8222 Merge pull request #1194 from consul/notifications-polish
Notifications polish
2016-08-04 11:29:21 +02:00
rgarcia
24bc8cca20 runs all specs 2016-08-03 20:56:33 +02:00
rgarcia
4f4a5b68e5 runs all spec file 2016-08-03 20:50:37 +02:00
rgarcia
3b5e0b55c0 tries to fix flacky spec 2016-08-03 20:45:36 +02:00
Juanjo Bazán
0f7e23bec4 adds budget's groups & headings to admin 2016-08-03 20:23:41 +02:00
Juanjo Bazán
64a614c67f adds geozone helper to map ids and names 2016-08-03 20:20:52 +02:00
rgarcia
5bd7fdb263 fixes specs 2016-08-03 20:05:08 +02:00
rgarcia
63274dfe08 marks notifications as emailed after rake 2016-08-03 19:48:43 +02:00
rgarcia
0faff2f01c adds specs 2016-08-03 19:33:43 +02:00
rgarcia
9d9bf488fc does not create notifications for blocked or erased users 2016-08-02 20:52:20 +02:00
rgarcia
99b9c3867e adds pending spec 2016-08-02 20:52:08 +02:00
Juanjo Bazán
724ccf175c adds budget show to admin 2016-07-29 14:52:37 +02:00
Juanjo Bazán
6fce9df451 adds admin creation of budgets 2016-07-29 13:34:41 +02:00
Juanjo Bazán
a9c3629de7 adds missing trait to testing factories 2016-07-28 12:37:00 +02:00
Juanjo Bazán
1ad78d599e adds admin budgets index 2016-07-28 12:36:39 +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
5ea9f9b00c marks investment specs as pending 2016-07-27 13:05:56 +02:00
rgarcia
82db8bb673 adds tmp factory hack 2016-07-27 13:04:31 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
rgarcia
7fee1e43ff fixes specs 2016-07-27 11:33:59 +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
4ebd9bf0e9 renders budget's index view 2016-07-19 14:42:07 +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
Juanjo Bazán
6b351de6a1 fixes build 2016-07-11 10:43:27 +02:00
Juanjo Bazán
8316d9d895 fixes spec 2016-07-10 23:24:42 +02:00
Alberto Garcia Cabeza
67f07ba73a Fixes typo 2016-07-06 14:48:51 +02:00
Alberto Garcia Cabeza
edd8883deb Fixes specs 2016-07-06 13:43:05 +02:00
rgarcia
96630f88f2 takes into account emails separated by commas without spaces 2016-06-29 21:46:03 +02:00
rgarcia
745de9bb77 sends invitation email to users 2016-06-27 23:37:58 +02:00
rgarcia
00dbbd0689 fixes specs (unauthenticated users can view spending proposal show) 2016-06-20 21:54:45 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00
rgarcia
51d688897a displays badge option if official position is level 1 2016-06-20 21:37:03 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
Enrique García
588a2d84e4 Merge pull request #1154 from consul/stats
Adds stats for proposal notifications and direct messages
2016-06-16 18:42:10 +02:00
rgarcia
f9a2f5d5dc adds specs for stats 2016-06-16 17:59:56 +02:00
rgarcia
8ee7d535ba generic message for max_per_day setting 2016-06-16 15:54:19 +02:00
rgarcia
18dd9c95f3 fixes specs 2016-06-16 12:06:26 +02:00
rgarcia
b3fd5e225a Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications 2016-06-16 11:23:23 +02:00
rgarcia
91860cb409 validates that a user does not want to receive direct messages 2016-06-16 11:23:03 +02:00
rgarcia
25ebb325d1 limits maximum number of messages able to send per day 2016-06-16 11:10:26 +02:00
Juanjo Bazán
06596ac4d8 adds author_of? helper method 2016-06-15 17:01:50 +02:00
rgarcia
e2689d640c refactors notification helpers 2016-06-15 12:12:56 +02:00
rgarcia
95d244003e do not display link to send direct message 2016-06-15 12:03:38 +02:00
rgarcia
28d12fe55b removes sending individual proposal notifications via email 2016-06-15 10:43:02 +02:00
rgarcia
ce6072d17b sends a copy of the direct message to the sender 2016-06-14 18:55:28 +02:00