Juanjo Bazán
|
31fc2ae927
|
Merge pull request #1151 from consul/admin-styles
Improves styles for admin pages
|
2016-06-16 14:12:33 +02:00 |
|
Alberto Garcia Cabeza
|
7f20d4eb23
|
Improves styles for admin pages
|
2016-06-16 13:44:06 +02:00 |
|
Enrique García
|
5417adee4a
|
Merge pull request #1140 from consul/proposal-notifications
Proposal notifications and Direct Messages
|
2016-06-16 12:35:37 +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 |
|
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
|
e7a98f2adb
|
Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications
|
2016-06-15 17:03:45 +02:00 |
|
Alberto Garcia Cabeza
|
e87fda2c8d
|
Adds comments anchor on form link
|
2016-06-15 17:03:33 +02:00 |
|
Juanjo Bazán
|
06596ac4d8
|
adds author_of? helper method
|
2016-06-15 17:01:50 +02:00 |
|
Alberto Garcia Cabeza
|
60c1fdcb27
|
Changes text to 'share proposal'
|
2016-06-15 16:54:13 +02:00 |
|
rgarcia
|
fd55817832
|
Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications
|
2016-06-15 16:47:08 +02:00 |
|
rgarcia
|
19b6740d37
|
updates email from field
|
2016-06-15 16:46:54 +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
|
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 |
|
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 |
|