decabeza
|
5e0d5fc8c3
|
Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation
|
2017-05-22 18:43:49 +02:00 |
|
Juanjo Bazán
|
f0d7acd087
|
Merge pull request #1550 from consul/budgets-unfeasible
Investments reclassified as unfeasible
|
2017-05-18 14:37:32 +02:00 |
|
Juanjo Bazán
|
d08af6193e
|
changes unselected scope to include undecided feasibility
|
2017-05-17 15:13:29 +02:00 |
|
rgarcia
|
42f62e5c36
|
stores reclassified votes
|
2017-05-17 15:13:28 +02:00 |
|
rgarcia
|
c0488c3b3c
|
refactors investment filters
|
2017-05-06 04:57:06 +02:00 |
|
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
|
255b57cc85
|
Admin for custom pages
|
2017-04-06 16:25:07 +02:00 |
|
kikito
|
871846c070
|
includes :invalid option in officing_residence factory
|
2017-02-12 14:22:46 +01:00 |
|
Amaia Castro
|
b298fb7316
|
Show annotation context in annotation page
Only works with quotes within the same html node for now
|
2017-02-10 15:35:42 +01:00 |
|
Amaia Castro
|
3009706b0d
|
Don’t allow comments on questions for unverified users and when the phase is closed
|
2017-02-08 18:19:10 +01:00 |
|
Juanjo Bazán
|
c9c4b30ffc
|
adds Null/White Results models
|
2017-02-03 19:08:40 +01:00 |
|
rgarcia
|
2bc4649aa7
|
uses year of birth instead of date of birth
|
2017-02-01 11:13:59 +01:00 |
|
kikito
|
883658e391
|
removes summary from factory
|
2017-01-30 19:23:47 +01:00 |
|
Juanjo Bazán
|
72ac75abeb
|
adds final recounting to poll officers' zone
|
2017-01-30 17:44:39 +01:00 |
|
rgarcia
|
c74587d921
|
fixes specs
|
2017-01-29 14:13:24 +01:00 |
|
rgarcia
|
6c34599e1e
|
adds officer residence check and user voting
|
2017-01-29 00:36:20 +01:00 |
|
Amaia Castro
|
53d13d8524
|
Create a new comment instead of a new annotation with the same ranges
|
2017-01-25 16:04:10 +01:00 |
|
Juanjo Bazán
|
b13a76963a
|
records participation of user via web
answering a poll question creates a voter with the user data to record
participation in question’s poll
|
2017-01-25 14:21:03 +01:00 |
|
Juanjo Bazán
|
5a72e4fbe8
|
fixes factories method call
|
2017-01-25 14:18:32 +01:00 |
|
Juanjo Bazán
|
6bc4f5b307
|
adds Poll::Answer model for web users
PartialResults is kept for booth results
|
2017-01-25 12:46:44 +01:00 |
|
Juanjo Bazán
|
113f9b32d7
|
Merge branch 'master' into polls
|
2017-01-19 16:51:19 +01:00 |
|
Amaia Castro
|
49e66a431c
|
Check phase dates and that draft version is not final before creating annotations
|
2017-01-13 19:11:05 +01:00 |
|
Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
Amaia Castro
|
b8f034d896
|
Legislation annotations/comments page
|
2017-01-09 09:29:15 +01:00 |
|
Juanjo Bazán
|
0e9cec2ca6
|
adds spec for recount/officers lists in booth_assignment show
|
2017-01-05 13:00:48 +01:00 |
|
Amaia Castro
|
ee9fa3db15
|
Base Legislation Annotations
|
2017-01-04 12:56:58 +01:00 |
|
Juanjo Bazán
|
c2a61096aa
|
adds required date to recount factory
fixes recount spec
|
2017-01-03 23:02:58 +01:00 |
|
Juanjo Bazán
|
1aa845a9c6
|
adds published to polls
|
2017-01-02 18:23:24 +01:00 |
|
Juanjo Bazán
|
fe1c12c661
|
updates count_log if recount count value changes
|
2017-01-02 13:36:30 +01:00 |
|
kikito
|
d80dedaad8
|
Adds sanitized descriptions for all phases to budget model
|
2017-01-01 12:51:17 +01:00 |
|
kikito
|
fa50e3f215
|
Adds new phases to budget and fixes specs
|
2016-12-30 18:43:15 +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
|
5e01b380cd
|
Legislation Answer model
|
2016-12-27 18:21:50 +01:00 |
|
Juanjo Bazán
|
77c2d61c64
|
adds date to officer_assignment factory
|
2016-12-27 17:45:46 +01:00 |
|
Amaia Castro
|
04b23cfc7b
|
Merge branch 'master' into legislation-module-stable
|
2016-12-27 16:43:43 +01:00 |
|
kikito
|
9d97421b0e
|
Merge branch 'master' into budgets
|
2016-12-27 14:02:12 +01:00 |
|
kikito
|
8e4bd43069
|
Makes the selected trait also mark projects feasible and valuation_finished
|
2016-12-24 14:43:12 +01:00 |
|
Amaia Castro
|
de5df61359
|
Legislation question comments spec
|
2016-12-23 15:40:52 +01:00 |
|
kikito
|
430507ec1e
|
Adds budget_lines.selected
|
2016-12-22 20:24:59 +01:00 |
|
Amaia Castro
|
d25d6c178c
|
Legislation Questions model and basic admin
|
2016-12-20 18:52:43 +01:00 |
|
rgarcia
|
d09348ee49
|
adds specs
|
2016-12-20 16:46:20 +01:00 |
|
rgarcia
|
76723070e2
|
adds pending specs
|
2016-12-20 12:21:45 +01:00 |
|
Amaia Castro
|
a4055a1578
|
Legislation processes home page
|
2016-12-16 17:59:44 +01:00 |
|
kikito
|
366a3e7552
|
simplifies factories now that we have denormalization in investment and ballot lines
|
2016-12-15 18:18:31 +01:00 |
|
Amaia Castro
|
e4315f94c8
|
Merge branch 'master' into legislation-module-stable
|
2016-12-15 11:26:22 +01:00 |
|
Juanjo Bazán
|
45d26f6dee
|
refactors poll::voter
now belongs_to booth_assignment instead of to booth
|
2016-12-06 20:20:18 +01:00 |
|
Juanjo Bazán
|
ad2dd7d267
|
adds officer-polls relation and spec
|
2016-12-06 14:51:53 +01:00 |
|
Amaia Castro
|
e4fe499e66
|
DraftVersion base model and very basic admin pages
|
2016-12-06 12:10:20 +01:00 |
|