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
a56898fed7
Fix version chooser for annotations page
2017-01-11 23:11:11 +01:00
Amaia Castro
a2a61341fe
Merge branch 'master' into legislation-module-stable
2017-01-11 22:54:41 +01:00
Amaia Castro
4a5276f089
Revert change in admin namespace helper and redefine it in the controller
2017-01-11 15:43:46 +01:00
Juanjo Bazán
053a3e7b41
makes user page to show only active feature comments
2017-01-10 21:28:04 +01:00
Amaia Castro
4f539b374f
View comments for draft text
2017-01-10 17:25:02 +01:00
Juanjo Bazán
a5338a4455
removes problematic html_safe link from flash notice
...
No need for it now that investments are public
2017-01-09 18:16:59 +01:00
rgarcia
f2d23b56e0
fixes conflicts with budgets
2017-01-09 13:33:01 +01:00
Amaia Castro
b8f034d896
Legislation annotations/comments page
2017-01-09 09:29:15 +01:00
rgarcia
be10972406
fixes management specs
2017-01-08 13:39:01 +01:00
rgarcia
3ba57bbab2
adds valuator tags
2017-01-08 13:24:05 +01:00
rgarcia
fd28f6c2b3
adds tags to investment
2017-01-08 11:37:02 +01:00
kikito
b7a0aa3b57
Fixes i18n errors now that they are detected by i18n-tasks
2017-01-06 19:55:23 +01:00
kikito
3c9e08b06f
Adds organization_name attribute to budget investments
2017-01-06 18:43:55 +01:00
kikito
b36bb7bb97
fixes permission error when entering my ballot
2017-01-05 18:25:00 +01:00
kikito
248755a801
Modifies the investment orders shown by phase
2017-01-05 17:38:36 +01:00
Fernando Blat
1fbb10ff34
Include link to resource in the flash message
2017-01-05 17:03:08 +01:00
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
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
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
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
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
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
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
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
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
