Commit Graph

5383 Commits

Author SHA1 Message Date
rgarcia
1f7e86e206 fixes specs 2016-06-20 22:06:49 +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
Alberto Garcia Cabeza
3299b595aa Adds info text on proposal notification digest 2016-06-20 16:28:56 +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
b7e3129ec1 uses more efficient count 2016-06-16 18:35:34 +02:00
Alberto Garcia Cabeza
352f3fa2f9 Resolves conflicts and improves styles for stats 2016-06-16 18:07:13 +02:00
rgarcia
f9a2f5d5dc adds specs for stats 2016-06-16 17:59:56 +02:00
rgarcia
0abc9c8376 adds stats for direct messages and proposal notifications 2016-06-16 17:42:16 +02:00
rgarcia
d40af1e94c do not display button to send message to myself 2016-06-16 16:05:09 +02:00
Alberto Garcia Cabeza
7f20d4eb23 Improves styles for admin pages 2016-06-16 13:44:06 +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
Alberto Garcia Cabeza
9f7b49838d Improves texts for the sender's email 2016-06-15 21:37:36 +02:00
Alberto Garcia Cabeza
c83e831cb7 Adds link to not receive direct messages 2016-06-15 21:28:17 +02:00
Alberto Garcia Cabeza
419ced5a18 Adds text to form new 2016-06-15 21:14:56 +02:00
Alberto Garcia Cabeza
dd7629b5af Adds notification menu and message for empty notifications 2016-06-15 21:00:56 +02:00
Alberto Garcia Cabeza
017ccfb378 Changes title and subject in email 2016-06-15 20:49:29 +02:00
Alberto Garcia Cabeza
0f1d6c1f19 Adds text in footer about not replying 2016-06-15 20:44:32 +02:00
Alberto Garcia Cabeza
0366d7efb2 Adds translations on mailer message 2016-06-15 17:55:42 +02:00
Alberto Garcia Cabeza
f606a3bcbe Adds link to unsubscribe in digest email 2016-06-15 17:33:25 +02:00
Alberto Garcia Cabeza
2dc39192b8 Adds button to proposal's show to 'Send notification' 2016-06-15 17:13:44 +02:00
Alberto Garcia Cabeza
e87fda2c8d Adds comments anchor on form link 2016-06-15 17:03:33 +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
90148ffdca adds missing translation 2016-06-15 11:34:33 +02:00
rgarcia
cdc2bd67a4 adds correct order for email action links 2016-06-15 10:51:58 +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
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
rgarcia
6e800c5120 adds email digest for proposal notifications 2016-06-14 17:53:36 +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
143089603c fixes specs 2016-06-13 12:33:46 +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
rgarcia
00fc5b77e5 adds permissions in view for direct messages 2016-06-09 17:42:13 +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
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
34304a0b5e fixes conflicts with master 2016-06-07 23:19:01 +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