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 |
|
Raimond Garcia
|
9f195350a3
|
Merge pull request #1158 from consul/proposal-notification-mailer
Adds info text on proposal notification digest
|
2016-06-20 18:14:13 +02:00 |
|
Alberto Garcia Cabeza
|
ecd9d514af
|
Improves translation
|
2016-06-20 16:33:08 +02:00 |
|
Alberto Garcia Cabeza
|
3299b595aa
|
Adds info text on proposal notification digest
|
2016-06-20 16:28:56 +02:00 |
|
rgarcia
|
18354587ab
|
force travis restart
|
2016-06-17 15:47:23 +02:00 |
|
Juanjo Bazán
|
74282bb0d7
|
updates ruby version to 2.3.1
|
2016-06-17 11:58:53 +02:00 |
|
Raimond Garcia
|
6ba532a6db
|
Merge pull request #1153 from consul/no-roadmap
removes deprecated roadmap
|
2016-06-16 18:56:17 +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
|
3c2098eb14
|
improves legibility of counts
|
2016-06-16 18:40:05 +02:00 |
|
rgarcia
|
b7e3129ec1
|
uses more efficient count
|
2016-06-16 18:35:34 +02:00 |
|
rgarcia
|
974d04ca7f
|
Merge branch 'master' of github.com:AyuntamientoMadrid/participacion
|
2016-06-16 18:23:42 +02:00 |
|
Juanjo Bazán
|
fc1ca8f823
|
adds doc/locales folder with contributed locales
adds fr & pt-br
|
2016-06-16 18:23:20 +02:00 |
|
rgarcia
|
32736110f9
|
adds missing translation
|
2016-06-16 18:20:14 +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 |
|
Juanjo Bazán
|
1c4a572993
|
removes deprecated roadmap
"If you have a roadmap, you are locked in an old version of the future" - David Heinemeier Hansson
|
2016-06-16 16:58:05 +02:00 |
|
Juanjo Bazán
|
75c6dde8d7
|
Merge pull request #1152 from consul/direct_message_polish
Direct message polish
|
2016-06-16 16:38:27 +02:00 |
|
Alberto Garcia Cabeza
|
38fded40d8
|
Changes translations
|
2016-06-16 16:22:48 +02:00 |
|
rgarcia
|
d40af1e94c
|
do not display button to send message to myself
|
2016-06-16 16:05:09 +02:00 |
|
rgarcia
|
8ee7d535ba
|
generic message for max_per_day setting
|
2016-06-16 15:54:19 +02:00 |
|
rgarcia
|
86fcd4fa76
|
removes blank space in setting's key
|
2016-06-16 15:45:33 +02:00 |
|
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 |
|