kikito
|
b6dfd7178d
|
Merge branch 'budgets-select' of github.com:consul/consul into budgets-select
|
2016-12-28 12:18:17 +01:00 |
|
Alberto Garcia Cabeza
|
d8cc888d60
|
changes table headings and selected button css
|
2016-12-28 12:17:08 +01:00 |
|
Juanjo Bazán
|
f5b032cfbe
|
Merge branch 'master' into polls
|
2016-12-28 12:16:55 +01:00 |
|
rgarcia
|
0a6e86ea83
|
increase delayed job max run time to 30 minutes
|
2016-12-28 11:41:41 +01:00 |
|
rgarcia
|
c9f62bf2b9
|
fixes conflicts
|
2016-12-28 11:41:32 +01:00 |
|
rgarcia
|
d554ec810a
|
adds document counter to signature sheet
|
2016-12-28 11:40:20 +01:00 |
|
kikito
|
93047ed68e
|
Merge branch 'budgets-select' of github.com:consul/consul into budgets-select
|
2016-12-28 11:12:39 +01:00 |
|
kikito
|
31aed877e8
|
i18n
|
2016-12-27 18:56:11 +01:00 |
|
Juanjo Bazán
|
b63d9ac98e
|
removes unused key
|
2016-12-27 18:36:46 +01:00 |
|
Juanjo Bazán
|
5ec12e4b5b
|
Merge branch 'master' into redux-polling
|
2016-12-27 18:22:06 +01:00 |
|
Alberto Garcia Cabeza
|
3121dd066e
|
adds thead and button to select on budget investement index table
|
2016-12-27 18:02:35 +01:00 |
|
Juanjo Bazán
|
40f6ca5886
|
adds poll shift management to admin
|
2016-12-27 17:47:15 +01:00 |
|
kikito
|
9d97421b0e
|
Merge branch 'master' into budgets
|
2016-12-27 14:02:12 +01:00 |
|
Juanjo Bazán
|
ee8c057a46
|
adds officer search to admin polls
|
2016-12-27 12:36:16 +01:00 |
|
Alberto Garcia Cabeza
|
7f9d1dfc09
|
Merge branch 'polls' into polls-design
|
2016-12-26 18:22:07 +01:00 |
|
Alberto Garcia Cabeza
|
ba9ed83a3a
|
separates answerable questions and moves callout to a partial
|
2016-12-26 17:22:40 +01:00 |
|
Juanjo Bazán
|
f0156c5b5a
|
adds admin search/add/remove question to poll
|
2016-12-26 16:19:35 +01:00 |
|
rgarcia
|
1bb307580f
|
makes translations aware of pluralisation
|
2016-12-26 12:03:39 +01:00 |
|
rgarcia
|
af7d71ccfd
|
Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets
|
2016-12-26 11:14:56 +01:00 |
|
kikito
|
526a6e2097
|
i18n
|
2016-12-25 23:18:58 +01:00 |
|
kikito
|
4b92cf3acf
|
Removes unused error messages from 18n
|
2016-12-25 12:57:46 +01:00 |
|
kikito
|
32710f57e1
|
Organization instead of organisation
|
2016-12-25 12:57:34 +01:00 |
|
kikito
|
2fab251593
|
adds i18n entries
|
2016-12-25 12:53:27 +01:00 |
|
Juanjo Bazán
|
d057c9457d
|
Merge branch 'master' into signature-sheets
|
2016-12-23 20:23:56 +01:00 |
|
Juanjo Bazán
|
8b4f519d71
|
adds booth assignation to admin poll
|
2016-12-23 19:06:55 +01:00 |
|
rgarcia
|
37462b79cd
|
removes unused translations
|
2016-12-23 18:37:39 +01:00 |
|
Fernando Blat
|
8c8b273de0
|
Settings translation
|
2016-12-23 15:51:20 +01:00 |
|
Fernando Blat
|
85ce7d7227
|
Devise won't read mail from Settings in test environment
|
2016-12-23 15:45:20 +01:00 |
|
kikito
|
9e0007ba35
|
renames i18n entry
|
2016-12-23 15:38:31 +01:00 |
|
Alberto Garcia Cabeza
|
c0c76b67c2
|
adds successful proposals list on admin questions index
|
2016-12-23 14:16:29 +01:00 |
|
Alberto Garcia Cabeza
|
e26b6db584
|
changes text on poll booths admin menu
|
2016-12-23 13:48:34 +01:00 |
|
Fernando Blat
|
a07fbc5b41
|
Extract mailer from name and address to a setting
|
2016-12-23 11:28:53 +01:00 |
|
kikito
|
cd72b7e537
|
Renames i18n param
|
2016-12-22 20:27:16 +01:00 |
|
Alberto Garcia Cabeza
|
151db53a9b
|
fixes specs
|
2016-12-22 19:06:11 +01:00 |
|
Alberto Garcia Cabeza
|
a6fbe063c9
|
adds styles to polls index and show views
|
2016-12-22 18:30:39 +01:00 |
|
rgarcia
|
675081141c
|
refactors signatures
|
2016-12-21 18:46:31 +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
|
6afe594e75
|
adds missing i18n
|
2016-12-21 12:45:57 +01:00 |
|
Alberto Garcia Cabeza
|
4e7589f406
|
improves accessibility on subnavigation menu
|
2016-12-21 12:35:48 +01:00 |
|
rgarcia
|
53ac18f68f
|
updates views
|
2016-12-20 17:06:03 +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 |
|
rgarcia
|
3c682b8a9b
|
adds signature sheets
|
2016-12-20 12:21:05 +01:00 |
|
kikito
|
eb5291d8a6
|
Fixes budgets/votes_spec
|
2016-12-19 19:10:49 +01:00 |
|
Alberto Garcia Cabeza
|
45ae3688f5
|
removes unused text on header
|
2016-12-19 16:27:41 +01:00 |
|
Alberto Garcia Cabeza
|
d45442deed
|
changes text on delete position officers
|
2016-12-16 14:27:55 +01:00 |
|
Alberto Garcia Cabeza
|
30a56d21f7
|
changes text to remove questions on polls questions list
|
2016-12-16 14:09:04 +01:00 |
|
Alberto Garcia Cabeza
|
0ddf7a003c
|
adds dates on polls index
|
2016-12-16 14:02:03 +01:00 |
|
Raimond Garcia
|
ad8b373340
|
Merge pull request #1294 from consul/polls-views
Polls views
|
2016-12-14 19:26:55 +01:00 |
|