Amaia Castro
|
5caa31dba1
|
Merge branch 'master' into legislation-module-stable
|
2017-03-25 13:34:49 +01:00 |
|
Alberto Garcia Cabeza
|
dadfdba1b1
|
adds date of birth form when manager creates new user
|
2017-03-20 11:59:22 +01:00 |
|
Amaia Castro
|
483d7c6e2b
|
Merge branch 'master' into legislation-module-stable
|
2017-03-17 18:08:22 +01:00 |
|
rgarcia
|
170cb89a5c
|
allows admins to see budgets in reviewing and selecting phase
|
2017-03-15 14:50:50 +01:00 |
|
Amaia Castro
|
13ff9816ae
|
Merge pull request #124 from medialab-prado/122-color-intensity
Annotations color intensity according to (comments) weight
|
2017-03-09 16:27:14 +01:00 |
|
Amaia Castro
|
1cedf73a39
|
Merge pull request #123 from medialab-prado/120-hidden-comments
Several comments boxes
|
2017-03-09 16:26:33 +01:00 |
|
Amaia Castro
|
d95f902fdf
|
Merge branch 'master' into legislation-module-stable
|
2017-03-07 23:19:26 +01:00 |
|
kikito
|
3dbdc8f455
|
Adds delete link to budget investment list in user activities
|
2017-03-06 19:24:10 +01:00 |
|
Amaia Castro
|
854d51dd8e
|
Calculate annotations weight and add weight css classes for color intensity
|
2017-03-02 14:25:23 +01:00 |
|
Amaia Castro
|
c7eaadb4b2
|
Show comment boxes for all annotations at the clicked point
|
2017-02-24 15:45:36 +01:00 |
|
Amaia Castro
|
20bfe5e0e5
|
Fix annotation highlight on click
|
2017-02-23 16:04:55 +01:00 |
|
Amaia Castro
|
28de717300
|
Show only active phases
|
2017-02-09 17:32:38 +01:00 |
|
Amaia Castro
|
5d37997a69
|
Redirect to allegations phase if open
|
2017-02-09 16:59:02 +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
|
60c7947cb4
|
Merge branch 'master' into legislation-module-stable
|
2017-02-08 12:24:40 +01:00 |
|
Juanjo Bazán
|
ba0b39a45c
|
avoids error 500 if invalid random_seed
|
2017-02-07 19:29:17 +01:00 |
|
Juanjo Bazán
|
e93461356c
|
quotes random seed
|
2017-02-07 19:05:04 +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 |
|
Amaia Castro
|
289b8e044b
|
Fix url to notifiable when it is a Legislation Question or Annotation
|
2017-01-20 18:46:57 +01:00 |
|
Amaia Castro
|
1af047089f
|
Add form to publish a new first level comment from the comments box
|
2017-01-19 15:42:50 +01:00 |
|
Amaia Castro
|
6c36fde6cc
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 15:45:33 +01:00 |
|
Amaia Castro
|
00b488fe84
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 10:46:33 +01:00 |
|
rgarcia
|
5f7269a070
|
displays unfeasible budgets link from home
|
2017-01-16 03:09:08 +01:00 |
|
Raimond Garcia
|
69c043a886
|
Merge pull request #1356 from consul/budget-emails
Budget emails
|
2017-01-15 19:15:39 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
rgarcia
|
289666bb4d
|
loads tag cloud in balloting phase
|
2017-01-15 12:08:41 +01:00 |
|
rgarcia
|
938ba40306
|
loads categories in sidebar for balloting phase
|
2017-01-15 12:06:38 +01:00 |
|
rgarcia
|
68bf119c18
|
sends unfeasible budget investment
|
2017-01-14 17:02:33 +01:00 |
|
Fernando Blat
|
f1be212eeb
|
Fix and complete controller specs
|
2017-01-14 16:56:55 +01:00 |
|
Fernando Blat
|
f47cef5a93
|
Highlight text when creating a comment
|
2017-01-14 16:43:26 +01:00 |
|
Fernando Blat
|
4431d95d31
|
Basic annotation creation
|
2017-01-14 16:42:12 +01:00 |
|
rgarcia
|
82322ee233
|
sends budget investment created email
|
2017-01-14 16:10:43 +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 |
|
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 |
|
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 |
|