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
Alberto Garcia Cabeza
c0c76b67c2
adds successful proposals list on admin questions index
2016-12-23 14:16:29 +01:00
Amaia Castro
55eb03531c
Comments in legislation question page
2016-12-23 09:35:02 +01:00
kikito
54bd5aeeb1
adds @budget param to apply_filters_and_search
2016-12-22 20:26:21 +01:00
kikito
260b9aa1e4
loads @investment_ids in ballot lines controller
2016-12-22 20:25:41 +01:00
kikito
15fade5660
loads ballot in budget_investments_controller
2016-12-22 20:25:17 +01:00
Alberto Miedes Garcés
d83c370c6a
Remove duplicated code in Admin::BannersController
2016-12-22 17:18:27 +01:00
Amaia Castro
36399277ec
Legislation Process page
2016-12-22 11:23:49 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
Amaia Castro
fe92752069
Merge branch 'sandbox-html' into legislation-module-stable
2016-12-21 15:49:37 +01:00
Juanjo Bazán
bc690748fd
adds dates validation to polls
2016-12-21 13:50:15 +01:00
Amaia Castro
d25d6c178c
Legislation Questions model and basic admin
2016-12-20 18:52:43 +01:00
rgarcia
4eb700e3d4
refactors signature sheets
2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
kikito
a73626d712
Refactors and simplifies ballot/lines_controller.rb
2016-12-19 19:11:45 +01:00
Amaia Castro
54f8549c43
Set up sandbox
2016-12-16 18:57:10 +01:00
kikito
ff13dee918
Fixes incorrect path & params in bi controller
2016-12-16 18:03:36 +01:00
kikito
3bada69dd0
sets up the @investments variable n investments_controller
2016-12-16 18:03:14 +01:00
kikito
a52ea70c3d
Fixes honeypot-related issues in specs
2016-12-16 18:02:43 +01:00
Amaia Castro
a4055a1578
Legislation processes home page
2016-12-16 17:59:44 +01:00
Amaia Castro
766f509f8e
Base legislation processes and draft versions page structure for public site
2016-12-15 11:32:20 +01:00
Amaia Castro
e4315f94c8
Merge branch 'master' into legislation-module-stable
2016-12-15 11:26:22 +01:00
kikito
2a258fc558
Refactors set_investment_votes
2016-12-14 13:42:12 +01:00
kikito
8d60ea1d3c
Refactors apply_filters_and_search to inside investment model
2016-12-14 13:39:54 +01:00
Amaia Castro
400b510b71
Store the processed html from the markdown text body field
2016-12-14 11:32:28 +01:00
kikito
5b56336941
Fixes valuation features
2016-12-13 15:51:58 +01:00
kikito
2f446cf056
Renames "open" to "current" to avoid issues with existing method called "open"
2016-12-13 12:39:53 +01:00
Alberto Miedes Garcés
c22a80b48f
Move geozone 'safe to destroy' check from controller to model
2016-12-13 12:30:47 +01:00
Alberto Miedes Garcés
60da2a875b
CRUD html_map_coordinates geozone attribute
2016-12-08 16:50:36 +01:00
Alberto Miedes Garcés
6b53020185
Show districts ordered by name
2016-12-08 13:47:23 +01:00
Alberto Miedes Garcés
93e79228a7
Ability to delete geozones from admin dashboard
2016-12-08 13:16:42 +01:00
kikito
869f7b39d6
fixes i18n
2016-12-08 11:49:13 +01:00
Alberto Miedes Garcés
fea2009396
Ability to edit geozones from admin dashboard
2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
323c1b7593
Fixed layout for Admin::GeozonesController
2016-12-07 19:19:24 +01:00
kikito
748fd8becf
Makes all tests pass in bi management
2016-12-07 19:16:37 +01:00
kikito
b3be1633af
Fixes all management bi issues except filtering by geozone
2016-12-07 16:35:27 +01:00
Juanjo Bazán
91d5934567
removes unused code
2016-12-07 14:50:09 +01:00
Amaia Castro
a210914cb4
Avoid creating two instances of DraftVersion
2016-12-07 11:35:17 +01:00