Commit Graph

389 Commits

Author SHA1 Message Date
rgarcia
1c8290faa9 refactors budget translations 2016-09-02 13:51:16 +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
6fce9df451 adds admin creation of budgets 2016-07-29 13:34:41 +02:00
Juanjo Bazán
1ad78d599e adds admin budgets index 2016-07-28 12:36:39 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
rgarcia
f7810d44dd updates translations 2016-07-27 11:33:18 +02:00
Juanjo Bazán
6d2f28b13d removes unused i18n entries 2016-07-20 13:16:59 +02:00
Alberto Garcia Cabeza
c3d70f6e95 Adds text for show comment children 2016-07-14 18:02:27 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Alberto Garcia Cabeza
d24efbad60 Changes .com urls examples to .consul 2016-07-06 12:32:07 +02:00
Alberto Garcia Cabeza
22e1b533bc Removes Madrid from translations 2016-07-04 18:06:51 +02:00
Alberto Garcia Cabeza
e01162bc7a Changes message for ie alert 2016-06-22 11:17:27 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
Alberto Garcia Cabeza
38fded40d8 Changes translations 2016-06-16 16:22:48 +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
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
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
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
Alberto Garcia Cabeza
29f869046a Adds message for no accepting private messages 2016-06-10 18:01:59 +02:00
Alberto Garcia Cabeza
900d997000 Adds message for unverified users 2016-06-09 17:15:11 +02:00
Alberto Garcia Cabeza
ad856521fc Adds translations for direct messages 2016-06-09 16:00:13 +02:00
rgarcia
a0ddde16e9 adds notifications for proposals 2016-06-07 22:03:14 +02:00
Alberto Garcia Cabeza
0899a0ddb4 Improves styles for budget index and show views 2016-06-07 19:22:15 +02:00
Alberto Garcia Cabeza
14f17983f4 Improves styles for about receivers message 2016-06-06 17:30:31 +02:00
Alberto Garcia Cabeza
bdb5a83911 Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications 2016-06-06 17:26:56 +02:00
Alberto Garcia Cabeza
84f9dcaa76 Adds tabs for notifications on proposal show 2016-06-06 17:26:48 +02:00
rgarcia
a2c9756c18 displays message about receivers 2016-06-06 16:50:00 +02:00
rgarcia
ad697cd2c1 adds preference to receive proposal notifications 2016-06-06 12:55:33 +02:00
kikito
e2d88e30fd i18n for investments 2016-06-03 18:51:00 +02:00
Alberto Garcia Cabeza
0ef316de91 Improves styles for proposal notifications 2016-06-02 13:36:41 +02:00
rgarcia
6e4ed0b895 adds link to send message from my activity 2016-06-01 21:01:24 +02:00
rgarcia
f5375e813d stores a proposal notification 2016-06-01 17:23:56 +02:00
Alberto Garcia Cabeza
ddd061a17f Adds alternative text for sidebar map 2016-05-04 11:49:30 +02:00
Raimond Garcia
712e42ca9d Merge pull request #1104 from consul/admin-access-to-management
Admin access to management
2016-04-28 16:55:10 +02:00
Juanjo Bazán
6760199a90 Merge pull request #1090 from consul/back-links
Back links
2016-04-28 16:52:09 +02:00
kikito
6c9c2f1b96 removes obsolete/deprecated code 2016-04-28 14:00:20 +02:00
Juanjo Bazán
325d4e0544 adds link to management in admin header 2016-04-27 17:26:19 +02:00
kikito
4a95c85c48 Fixes typo in es.yml 2016-04-27 16:13:49 +02:00
kikito
eedf02a186 Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile 2016-04-27 16:07:48 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
Alberto Garcia Cabeza
79b0f38e34 Removes unused keys 2016-04-26 13:10:02 +02:00
Juanjo Bazán
296f41b1ed changes copy 2016-04-25 18:19:03 +02:00
Juanjo Bazán
479b48796f Merge pull request #1085 from consul/retire-proposals
Retire proposals
2016-04-25 18:00:34 +02:00
Juanjo Bazán
32f971f0ad Merge pull request #1084 from consul/spending-proposals-summary
Spending proposals admin summary
2016-04-25 11:29:07 +02:00