Amaia Castro
|
483d7c6e2b
|
Merge branch 'master' into legislation-module-stable
|
2017-03-17 18:08:22 +01:00 |
|
Juanjo Bazán
|
b8b7cda4e6
|
keeps Budget::Investment's group in sync with heading
|
2017-03-16 14:30:31 +01:00 |
|
rgarcia
|
170cb89a5c
|
allows admins to see budgets in reviewing and selecting phase
|
2017-03-15 14:50:50 +01:00 |
|
Amaia Castro
|
d95f902fdf
|
Merge branch 'master' into legislation-module-stable
|
2017-03-07 23:19:26 +01:00 |
|
Enrique García
|
15101c0d3e
|
Merge pull request #1434 from consul/valuation-tags
displays only valuation tags for filtering
|
2017-03-07 19:14:44 +01:00 |
|
rgarcia
|
712d5f2d9a
|
displays only valuation tags for filtering
|
2017-03-07 18:19:53 +01:00 |
|
kikito
|
8f91b1e2cc
|
fixes incorrect title/setup in spec
|
2017-03-07 16:42:45 +01:00 |
|
kikito
|
3dbdc8f455
|
Adds delete link to budget investment list in user activities
|
2017-03-06 19:24:10 +01:00 |
|
kikito
|
24920e73f6
|
Adds permissions for authors to destroy budget investments
|
2017-03-06 13:42:52 +01:00 |
|
Amaia Castro
|
6737d6afdd
|
Make annotation context work with multi-node annotations
|
2017-02-10 18:16:09 +01:00 |
|
Amaia Castro
|
b298fb7316
|
Show annotation context in annotation page
Only works with quotes within the same html node for now
|
2017-02-10 15:35:42 +01:00 |
|
Fernando Blat
|
04ad8bb6c7
|
Refactor JS and add update test
|
2017-02-10 09:48:28 +01:00 |
|
Amaia Castro
|
28de717300
|
Show only active phases
|
2017-02-09 17:32:38 +01:00 |
|
Amaia Castro
|
3009706b0d
|
Don’t allow comments on questions for unverified users and when the phase is closed
|
2017-02-08 18:19:10 +01:00 |
|
Amaia Castro
|
53d13d8524
|
Create a new comment instead of a new annotation with the same ranges
|
2017-01-25 16:04:10 +01:00 |
|
Fernando Blat
|
f7a6f8399b
|
Add pending translations
|
2017-01-23 14:58:12 +01:00 |
|
Amaia Castro
|
6e9750bcd8
|
Merge branch 'legislation-module-stable' into add-url-helpers-for-legislation-again
|
2017-01-21 21:52:44 +01:00 |
|
Amaia Castro
|
7a55ac1561
|
Merge branch 'master' into legislation-module-stable
|
2017-01-21 21:52:17 +01:00 |
|
Amaia Castro
|
7692fb9cb0
|
Try to avoid poltergeist error on hover
|
2017-01-20 19:56:33 +01:00 |
|
Amaia Castro
|
289b8e044b
|
Fix url to notifiable when it is a Legislation Question or Annotation
|
2017-01-20 18:46:57 +01:00 |
|
Fernando Blat
|
7613091d2e
|
Merge pull request #88 from medialab-prado/publish-comment-from-comments-box
Publish comment from comments box
|
2017-01-20 18:45:38 +01:00 |
|
Amaia Castro
|
78219b5c31
|
Merge branch 'master' into legislation-module-stable
|
2017-01-20 11:50:15 +01:00 |
|
Amaia Castro
|
47b35a8149
|
Add spec for publishing a comment from the comments box for a draft
|
2017-01-20 11:42:14 +01:00 |
|
Amaia Castro
|
551e8dc6c1
|
Increase Poltergeist timeout in specs
This is to try to avoid flaky js specs in Travis
|
2017-01-19 13:38:06 +01:00 |
|
Amaia Castro
|
35d2c54b4e
|
Merge branch 'master' into legislation-module-stable
|
2017-01-19 12:40:07 +01:00 |
|
rgarcia
|
c918c9e081
|
adds specs for many tags in a budget investment
|
2017-01-19 10:03:38 +01:00 |
|
Fernando Blat
|
5c3f87c4a2
|
Merge pull request #70 from medialab-prado/reorganize-locale-files
Change comments texts in legislation questions
|
2017-01-17 16:39:08 +01:00 |
|
Amaia Castro
|
6c36fde6cc
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 15:45:33 +01:00 |
|
Amaia Castro
|
53e9837db3
|
Change texts for legislation questions comments
|
2017-01-17 15:42:42 +01:00 |
|
Juanjo Bazán
|
555cc4529b
|
removes focus
|
2017-01-17 13:33:45 +01:00 |
|
Amaia Castro
|
00b488fe84
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 10:46:33 +01:00 |
|
rgarcia
|
dc2bfbdc97
|
fixes specs
|
2017-01-16 19:49:04 +01:00 |
|
rgarcia
|
5f7269a070
|
displays unfeasible budgets link from home
|
2017-01-16 03:09:08 +01:00 |
|
rgarcia
|
fa9cb00c65
|
displays appropriate permission messages in accepting phase
|
2017-01-15 20:37:44 +01:00 |
|
Raimond Garcia
|
69c043a886
|
Merge pull request #1356 from consul/budget-emails
Budget emails
|
2017-01-15 19:15:39 +01:00 |
|
rgarcia
|
0f1a98da7d
|
fixes conflicts with master
|
2017-01-15 19:04:12 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
Alberto Garcia Cabeza
|
9741ee859a
|
updates i18n and specs
|
2017-01-15 14:02:08 +01:00 |
|
rgarcia
|
42604e27b9
|
Displays tag cloud in all phases
|
2017-01-15 09:55:01 +01:00 |
|
Fernando Blat
|
819c9efcc3
|
Fix and complete feature specs
|
2017-01-14 17:19:27 +01:00 |
|
rgarcia
|
7aba8ef299
|
adds specs
|
2017-01-14 17:02:45 +01:00 |
|
Fernando Blat
|
f1be212eeb
|
Fix and complete controller specs
|
2017-01-14 16:56:55 +01:00 |
|
rgarcia
|
11a8086599
|
adds specs
|
2017-01-14 16:12:45 +01:00 |
|
Raimond Garcia
|
7f88100599
|
Merge pull request #1352 from consul/feasibility_link
Feasibility index
|
2017-01-14 12:36:26 +01:00 |
|
Juanjo Bazán
|
36140e0ce3
|
adds link to unfeasible investments to index page
|
2017-01-14 11:33:49 +01:00 |
|
rgarcia
|
6d71cd985c
|
displays appropriate vote info depending on phase
|
2017-01-13 21:15:08 +01:00 |
|
Amaia Castro
|
49e66a431c
|
Check phase dates and that draft version is not final before creating annotations
|
2017-01-13 19:11:05 +01:00 |
|
Raimond Garcia
|
4c818bfcc4
|
Merge pull request #1349 from consul/budgets-vote-permissions
User permissions for selecting phase
|
2017-01-13 18:34:31 +01:00 |
|
rgarcia
|
17946b292b
|
fixes specs
|
2017-01-13 16:37:39 +01:00 |
|
rgarcia
|
b2b9954e6d
|
allows user to support only in one heading per group
|
2017-01-13 15:24:57 +01:00 |
|