Commit Graph

244 Commits

Author SHA1 Message Date
rgarcia
a11f739956 updates budget dev seeds 2017-05-03 19:32:07 +02:00
Juanjo Bazán
d988acb18b Merge pull request #1483 from consul/polls
Polls
2017-04-07 13:06:10 +02:00
Alberto Garcia Cabeza
3d45c0ca1a adds telegram handle to dev seeds and admin settings 2017-04-06 18:34:50 +02:00
Alberto
6bbcc71ecb Merge branch 'master' into polls 2017-04-06 14:16:49 +02:00
Amaia Castro
5caa31dba1 Merge branch 'master' into legislation-module-stable 2017-03-25 13:34:49 +01:00
rgarcia
8c19802dc6 updates dev seeds for valuators 2017-03-24 15:41:57 +01:00
Amaia Castro
483d7c6e2b Merge branch 'master' into legislation-module-stable 2017-03-17 18:08:22 +01:00
Alberto Garcia Cabeza
8f13c0e2ec adds setting to add per page code on <head> and <body> 2017-03-16 17:04:36 +01:00
Raimond Garcia
3dd33c4247 Merge pull request #1388 from consul/recounting
Creation of Partial Results for Poll Officers
2017-02-02 16:39:24 +01:00
Juanjo Bazán
c4a1c47feb changes poll questions in dev_seeds to have different answers 2017-02-02 11:53:57 +01:00
rgarcia
9c7139300b updates poll voter dev seeds 2017-02-02 10:57:58 +01:00
kikito
05f5521e9e fixes dev_seed error due to using deprecated summary field in Poll::Question 2017-01-31 11:45:42 +01:00
rgarcia
ea701e9963 fixes conflicts with polls 2017-01-29 00:44:56 +01:00
rgarcia
6c34599e1e adds officer residence check and user voting 2017-01-29 00:36:20 +01:00
Juanjo Bazán
8b19dcfbd8 fixes typo 2017-01-28 20:29:45 +01:00
Juanjo Bazán
e07ebc7967 beautifies dev_seeds output 2017-01-28 20:17:20 +01:00
Juanjo Bazán
ee4320f4c1 removes noise from dev_seeds output 2017-01-28 20:05:01 +01:00
Juanjo Bazán
f8d3e645db adds poll recounts to dev_seeds 2017-01-28 19:55:02 +01:00
Alberto Miedes Garcés
5b7cbccd19 Merge branch 'master' into api-dev 2017-01-26 12:39:59 +01:00
kikito
d9351b123d prints a button to redirect to the poll when a question is answerable 2017-01-25 17:58:09 +01:00
Alberto Miedes Garcés
e3fca5c49f Remove functionality related to votes demographic info
Since this was giving me too much pain and nobody actually requested
this functionality, I decided to remove it.
2017-01-25 13:37:29 +01:00
kikito
8dbc72c374 moves geozones from poll question to poll in dev_seeds 2017-01-20 18:58:19 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
Alberto Garcia Cabeza
e18751ce5c verifies admin in dev seeds 2017-01-14 18:14:32 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
rgarcia
4d5b885b7e sets spending proposal's settings to nil 2017-01-10 20:13:48 +01:00
Juanjo Bazán
be0cbb9ea1 adds setting to dev_seeds values 2017-01-09 16:05:33 +01:00
rgarcia
64366ba1f6 tmp fix for heading geozones 2017-01-08 20:03:30 +01:00
Alberto Miedes Garcés
a31f6be3bd Add proposal notifications to seeds 2017-01-07 22:16:17 +01:00
Alberto Miedes Garcés
1e95cdfce3 Fix dev_seeds 2017-01-07 21:58:29 +01:00
Alberto Miedes Garcés
861a723724 Only show public_voter if votable.total_votes are above threshold 2017-01-07 17:22:18 +01:00
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
2017-01-05 13:06:48 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +01:00
Alberto Miedes Garcés
6445fffc0d Merge branch 'master' into api-dev-0.18.11 2017-01-04 16:21:32 +01:00
Juanjo Bazán
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
kikito
18bd44d91f do not use html in generation of unfeasibility reason 2017-01-03 18:00:35 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Juanjo Bazán
55fea6c037 adds polls-related seed data 2017-01-02 19:29:43 +01:00
Juanjo Bazán
08ea4b35eb Merge branch 'master' into polls 2017-01-02 12:14:40 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +01:00
kikito
f14f7b9a70 Adds new descriptions to budget in dev_seeds 2017-01-02 10:02:57 +01:00
Alberto Garcia Cabeza
00581fcacc adds setting key deleted by mistake 2016-12-30 17:21:50 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00