Commit Graph

62 Commits

Author SHA1 Message Date
Amaia Castro
9e5324cc1b Merge branch 'master' into site-customization 2017-04-07 17:29:33 +02:00
Amaia Castro
c1de2dced4 Custom content blocks for top_links and footer 2017-04-06 17:00:05 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00
Amaia Castro
255b57cc85 Admin for custom pages 2017-04-06 16:25:07 +02:00
Alberto
6bbcc71ecb Merge branch 'master' into polls 2017-04-06 14:16:49 +02:00
Juanjo Bazán
ee07dd5784 adds missing i18n files and keys 2017-04-05 13:32:28 +02:00
Juanjo Bazán
83e2df7410 adds signature sheets for budget investments 2017-04-05 12:59:42 +02:00
Juanjo Bazán
53290b3d0d renames budget phases 2017-03-23 12:48:00 +01:00
Juanjo Bazán
754095f4d0 fixes modified i18n key 2017-01-25 17:15:38 +01:00
kikito
6ed73f34b6 Adds activerecord translations 2017-01-24 18:10:30 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
kikito
3c9e08b06f Adds organization_name attribute to budget investments 2017-01-06 18:43:55 +01:00
rgarcia
517483f244 fixes typo 2017-01-05 01:24:25 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Juanjo Bazán
78db093e49 moves validation error message 2016-12-21 14:21:02 +01:00
Juanjo Bazán
bc690748fd adds dates validation to polls 2016-12-21 13:50:15 +01:00
Alberto Garcia Cabeza
a7aed27db4 adds styles and i18n to signature sheets admin views 2016-12-20 14:57:24 +01:00
rgarcia
2eb5dfdd4b adds translations 2016-12-20 12:21:17 +01:00
Juanjo Bazán
1dd312b309 adds i18n to poll/officers model name 2016-12-14 12:57:37 +01:00
Juanjo Bazán
e106d81107 adds entries info on booths index 2016-12-02 14:33:40 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
rgarcia
ceebae644f removes question column from poll_questions 2016-11-22 11:41:10 +01:00
rgarcia
d9ad658758 adds admin interface for poll questions 2016-11-17 09:30:42 +01:00
rgarcia
b54aee5702 displays voter name if already voted 2016-11-14 13:52:38 +01:00
rgarcia
8dc7285681 validates user has not already voted 2016-11-14 13:52:38 +01:00
rgarcia
44df91346a validates voter in census 2016-11-14 13:51:59 +01:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
Juanjo Bazán
8890380804 adds investment editing to admin 2016-09-07 14:13:40 +02:00
Juanjo Bazán
b0358e4867 adds index of investments with filters to admin 2016-09-05 17:50:58 +02:00
Juanjo Bazán
1ad78d599e adds admin budgets index 2016-07-28 12:36:39 +02:00
rgarcia
8ee7d535ba generic message for max_per_day setting 2016-06-16 15:54:19 +02:00
rgarcia
25ebb325d1 limits maximum number of messages able to send per day 2016-06-16 11:10:26 +02:00
rgarcia
16f10e34ef fixes specs 2016-06-07 23:17:00 +02:00
rgarcia
8e12fbdd55 adds time limit between notifications 2016-06-07 13:48:09 +02:00
kikito
2e0eaa80ca i18n 2016-04-13 13:56:15 +02:00
rgarcia
545e0a3d0e udpates translation keys 2016-04-04 14:41:43 +02:00
Alberto Garcia Cabeza
115868d207 Fixes issue in i18n 2016-04-04 13:19:15 +02:00
Ana
d16ea0dfaa Translation problem fixed 2016-04-04 00:29:25 +02:00
Juanjo Bazán
4fad283947 adds geozone and unfeasible filters to index 2016-03-30 14:04:01 +02:00
kikito
2ac12ef4a9 makes admin/spending_proposal/edit visually pleasant 2016-03-08 15:26:13 +01:00
kikito
49dec60615 adds a redeemable code to users. It can be filled up when signing up from /cuentasegura 2016-02-22 17:41:08 +01:00
Juanjo Bazán
54badef191 users can create spending proposals 2016-01-11 12:17:10 +01:00
Alberto Garcia Cabeza
7843834c9c Standardizes yml files format 2015-10-28 12:47:51 +01:00
rgarcia
e08ed41e98 fixes conflicts with master 2015-10-14 15:48:55 +02:00
kikito
5f74528f12 Modifies devise so that unconfirmed users w/o password can set it when confirming their account 2015-10-07 20:18:54 +02:00
juandefelix
45a29f2f4d added tag_list errors translations 2015-10-03 12:03:41 -05:00
Juanjo Bazán
7741023e6a adds activity page to administration 2015-09-22 16:30:43 +02:00