kikito
7eba0fee50
Deactivates /ballot view when not in the balloting phase
2017-01-05 15:18:16 +01:00
rgarcia
c3380d18fa
fixes conflicts with budgets
2017-01-05 13:14:09 +01:00
Fernando Blat
ed714f7c7d
Add flash messages. Redirect to edit action after update
2017-01-05 12:56:55 +01:00
Juanjo Bazán
70b86170a2
adds booth_assignment show with officers and recounts info
2017-01-04 21:00:36 +01:00
kikito
635de83f86
prints the right value in budgets table
2017-01-04 18:48:01 +01:00
kikito
9c66fa0dc8
removes filter from valuation index page
2017-01-04 16:31:16 +01:00
Alberto Miedes Garcés
6445fffc0d
Merge branch 'master' into api-dev-0.18.11
2017-01-04 16:21:32 +01:00
Amaia Castro
2b6df62dd7
Refactor process phases pages
2017-01-04 14:02:25 +01:00
Amaia Castro
ee9fa3db15
Base Legislation Annotations
2017-01-04 12:56:58 +01:00
Amaia Castro
6d99a24740
Fix draft versions list
2017-01-04 10:13:55 +01:00
Juanjo Bazán
0953a536af
adds recounting to officing
2017-01-03 22:23:54 +01:00
Juanjo Bazán
09dac72471
adds officing's polls index
2017-01-03 22:22:52 +01:00
Amaia Castro
f040759693
Show only published draft versions to users (and also drafts to admins)
2017-01-03 22:08:54 +01:00
kikito
5ac2d9ccc9
started working on tags for budget investments. Error in investments/show because paths are hard
2017-01-03 17:13:28 +01:00
Alberto Miedes Garcés
2c5925f947
Refactor GraphqlController
2017-01-03 13:24:00 +01:00
Amaia Castro
5627b18be2
Draft Version page
2017-01-02 18:05:15 +01:00
kikito
9e4b2fda89
Adds phases to form
2017-01-01 15:03:58 +01:00
Amaia Castro
30ec5bdcb5
Build one option for the questions form when creating a new question
2016-12-30 11:22:39 +01:00
Amaia Castro
8c5b4d8c74
Merge pull request #37 from medialab-prado/sandbox-html
...
Legislation Processes HTML [WIP]
2016-12-30 10:52:29 +01:00
kikito
110a4091f8
Adds budget investment location
2016-12-29 17:30:21 +01:00
kikito
34ee8c1c48
Makes Budgets editable, and makes their description editable with html
2016-12-29 16:21:42 +01:00
Amaia Castro
5b3dcd7886
Force processes order
2016-12-29 09:59:29 +01:00
Amaia Castro
5584835314
Merge branch 'legislation-module-stable' into sandbox-html
2016-12-29 09:27:07 +01:00
Amaia Castro
f505d6fec7
Check if debate phase is open to create answers
2016-12-28 22:02:08 +01:00
Juanjo Bazán
ca0e6d6694
adds authorization for poll officers
2016-12-28 20:54:02 +01:00
kikito
d2356c18d0
Adds toggle_selection action
2016-12-28 19:11:59 +01:00
kikito
010aeaa9ac
i18n
2016-12-28 17:42:15 +01:00
Amaia Castro
2693393eb0
Answer question through ajax
2016-12-28 16:21:58 +01:00
Amaia Castro
a6ceab6d73
Answer legislation questions
2016-12-27 19:49:03 +01:00
Juanjo Bazán
7b6713f8bb
fixes typo in method call
2016-12-27 18:26:27 +01:00
Juanjo Bazán
5ec12e4b5b
Merge branch 'master' into redux-polling
2016-12-27 18:22:06 +01:00
Juanjo Bazán
40f6ca5886
adds poll shift management to admin
2016-12-27 17:47:15 +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
Juanjo Bazán
283a474135
adds order to search results
2016-12-27 12:38:46 +01:00
Juanjo Bazán
ee8c057a46
adds officer search to admin polls
2016-12-27 12:36:16 +01:00
Amaia Castro
e03522e267
Merge branch 'legislation-module-stable' into sandbox-html
2016-12-27 12:36:10 +01:00
Amaia Castro
eed8f1dd83
Set admin layout for admin sandbox templates
2016-12-27 12:32:07 +01:00
Juanjo Bazán
f0156c5b5a
adds admin search/add/remove question to poll
2016-12-26 16:19:35 +01:00
Alberto Miedes Garcés
d4b049175c
Merge branch 'master' into api-dev-0.18.11
2016-12-26 12:55:17 +01:00
kikito
84418bd671
Fixes issue in has_orders concern
2016-12-25 22:58:21 +01:00
kikito
e15377b7d8
Load @assigned_heading in addition to loading @heading
2016-12-25 12:54:48 +01:00
kikito
ef0acaf20f
Only creates ballot when budget balloting
2016-12-25 12:54:32 +01:00
kikito
3fd1993f74
only creates ballots when budget balloting
2016-12-25 12:54:07 +01:00
kikito
03ef20bfde
Merges orders_helper functionality inside has_orders concern
...
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +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
Alberto Garcia Cabeza
082c483269
removes unnecessary method on questions controller
2016-12-23 18:31:45 +01:00
Fernando Blat
704dffe7c5
Merge pull request #39 from medialab-prado/28-question-page-comments
...
Comments in legislation question page
2016-12-23 18:20:27 +01:00
Amaia Castro
33266e41fe
Merge branch 'master' into legislation-module-stable
2016-12-23 16:00:55 +01:00
