Commit Graph

994 Commits

Author SHA1 Message Date
Fernando Blat
819c9efcc3 Fix and complete feature specs 2017-01-14 17:19:27 +01:00
Amaia Castro
a56898fed7 Fix version chooser for annotations page 2017-01-11 23:11:11 +01:00
Amaia Castro
306e3fa59f Don’t show comments panel if seeing final version 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
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
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
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
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
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
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
0c5063add9 Show message when there aren't processes 2017-01-05 09:36:08 +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
kikito
e9acf295b8 removes filter specs after removing filtering from valuation 2017-01-04 17:00:56 +01:00
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +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
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
kikito
52d182f099 Removes geozone from budget heading 2017-01-03 18:51:21 +01:00
Amaia Castro
d2b3a21182 Fix abilities and add specs 2017-01-03 17:48:21 +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
99e3afd6ca Merge branch 'legislation-module-stable' into 13-draft-version-page 2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91 Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Amaia Castro
98b6dd75ea Fix stack level too deep bug when deleting questions with answers 2017-01-02 20:45:20 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
kikito
98e9e8de0f Fixes errors in specs related to changes in budget phases 2017-01-02 10:37:37 +01:00