Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
Raimond Garcia
|
f2dc822bfa
|
Merge pull request #1334 from consul/budgets
WIP Budgets
|
2017-01-10 22:43:27 +01:00 |
|
Juanjo Bazán
|
05ca715dee
|
Merge pull request #1341 from consul/budgets-settings
Sets spending proposal's settings to nil
|
2017-01-10 21:47:20 +01:00 |
|
rgarcia
|
53c5ea7e90
|
fixes specs
|
2017-01-10 21:30:38 +01:00 |
|
Juanjo Bazán
|
053a3e7b41
|
makes user page to show only active feature comments
|
2017-01-10 21:28:04 +01:00 |
|
Juanjo Bazán
|
7a448b6890
|
adds BudgetInvestment case to users_helpers
|
2017-01-10 20:58:01 +01:00 |
|
Amaia Castro
|
1966c5b8fd
|
Use mouse over event in spec
|
2017-01-10 18:30:30 +01:00 |
|
Amaia Castro
|
329b288c01
|
Try to fix poltergeist error in spec
|
2017-01-10 17:56:35 +01:00 |
|
Juanjo Bazán
|
76d818dd1b
|
adds Budget::Investment comments specs
|
2017-01-10 14:31:28 +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 |
|
Amaia Castro
|
f43f13e826
|
Create first comment automatically from the annotation
|
2017-01-09 17:03:00 +01:00 |
|
Juanjo Bazán
|
5a0d28f9f0
|
updates verification spec
|
2017-01-09 16:05:44 +01:00 |
|
Juanjo Bazán
|
e2118f701b
|
removes hardcoded age, favours setting
|
2017-01-09 16:05:27 +01:00 |
|
rgarcia
|
cc891b4f30
|
fixes specs
|
2017-01-09 14:10:07 +01:00 |
|
rgarcia
|
f2d23b56e0
|
fixes conflicts with budgets
|
2017-01-09 13:33:01 +01:00 |
|
rgarcia
|
b84ec0857c
|
fixes specs
|
2017-01-09 11:02:15 +01:00 |
|
Amaia Castro
|
b8f034d896
|
Legislation annotations/comments page
|
2017-01-09 09:29:15 +01:00 |
|
Amaia Castro
|
068c2c9f3d
|
Merge branch 'master' into legislation-module-stable
|
2017-01-09 09:27:38 +01:00 |
|
Alberto Garcia Cabeza
|
d5ffabac55
|
fixes specs for management budget investments
|
2017-01-08 22:17:37 +01:00 |
|
Alberto Garcia Cabeza
|
8722699cd8
|
fixes typos and spec for budgets investments
|
2017-01-08 22:17:14 +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 |
|
Alberto Miedes Garcés
|
4e019c79d6
|
Fix typo
|
2017-01-07 16:55:24 +01:00 |
|
kikito
|
248755a801
|
Modifies the investment orders shown by phase
|
2017-01-05 17:38:36 +01:00 |
|
kikito
|
28e6a10382
|
Hides balloting controls when not in the balloting phase
|
2017-01-05 15:17:49 +01:00 |
|
rgarcia
|
c3380d18fa
|
fixes conflicts with budgets
|
2017-01-05 13:14:09 +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 |
|
kikito
|
5f108944a8
|
final attempt at fixing travis
|
2017-01-05 12:49:53 +01:00 |
|
kikito
|
5eec8c7da2
|
attempts to fix travis again
|
2017-01-05 12:32:36 +01:00 |
|
Fernando Blat
|
de13574617
|
Show link to the first question
|
2017-01-05 12:31:20 +01:00 |
|
kikito
|
2a792a5499
|
attempts to fix failing spec in travis
|
2017-01-05 12:05:40 +01:00 |
|
kikito
|
9e2afeb503
|
removes deprecated spec (valuators are not shown in valuation table)
|
2017-01-05 11:26:46 +01:00 |
|
Fernando Blat
|
814cf9df56
|
Show creation date and status in admin list
|
2017-01-05 10:22:40 +01:00 |
|
Fernando Blat
|
fba4c79d2a
|
Show the first paragraph of the description
|
2017-01-05 09:43:40 +01:00 |
|
Fernando Blat
|
0c5063add9
|
Show message when there aren't processes
|
2017-01-05 09:36:08 +01:00 |
|
Fernando Blat
|
71ed50928f
|
Merge pull request #53 from medialab-prado/46-validate-legislation-process-dates
Validate date ranges for legislation process
|
2017-01-05 09:25:10 +01:00 |
|
rgarcia
|
dde1d34172
|
fixes conflicts with master
|
2017-01-05 01:56:35 +01:00 |
|
Alberto Garcia Cabeza
|
a42c1387cf
|
fixes specs
|
2017-01-04 19:38:49 +01:00 |
|
Amaia Castro
|
bc1905e5d9
|
Validate date ranges for legislation process
Only validates start and end dates for the whole process or a phase, not overlap between phases, as they are permitted, at least for now.
|
2017-01-04 18:13:28 +01:00 |
|
kikito
|
e9acf295b8
|
removes filter specs after removing filtering from valuation
|
2017-01-04 17:00:56 +01:00 |
|
kikito
|
4ceeb68a90
|
changes abilities extending valuation period
|
2017-01-04 15:59:36 +01:00 |
|
Amaia Castro
|
2b6df62dd7
|
Refactor process phases pages
|
2017-01-04 14:02:25 +01:00 |
|
kikito
|
f5dcb51d37
|
Adds valid_heading validation to budget line. Renames validation methods.
|
2017-01-04 13:56:42 +01:00 |
|
Fernando Blat
|
b6b33ff85b
|
Merge pull request #51 from medialab-prado/14-base-legislation-annotations
Base Legislation Annotations
|
2017-01-04 13:50:37 +01:00 |
|
Fernando Blat
|
ad20302052
|
Merge pull request #48 from medialab-prado/13-draft-version-page
Draft Version page
|
2017-01-04 13:43:54 +01:00 |
|
Amaia Castro
|
ee9fa3db15
|
Base Legislation Annotations
|
2017-01-04 12:56:58 +01:00 |
|
kikito
|
0f174df5fe
|
Removes geozones from budget heading views and specs
|
2017-01-04 12:46:11 +01:00 |
|
Amaia Castro
|
375602d297
|
Display title with an * when status is draft in version chooser
|
2017-01-04 12:15:12 +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 |
|