Amaia Castro
|
00b488fe84
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 10:46:33 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
rgarcia
|
68bf119c18
|
sends unfeasible budget investment
|
2017-01-14 17:02:33 +01:00 |
|
rgarcia
|
6d71cd985c
|
displays appropriate vote info depending on phase
|
2017-01-13 21:15:08 +01:00 |
|
Amaia Castro
|
49f4bf5bc5
|
Destroy object when their parent object is destroyed
|
2017-01-13 19:34:17 +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
|
b2b9954e6d
|
allows user to support only in one heading per group
|
2017-01-13 15:24:57 +01:00 |
|
rgarcia
|
470fe41585
|
only displays vote button in selecting phase
|
2017-01-13 11:13:01 +01:00 |
|
Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
Amaia Castro
|
4f539b374f
|
View comments for draft text
|
2017-01-10 17:25:02 +01:00 |
|
Juanjo Bazán
|
b71bcdd4b5
|
adds permissions to comment Investments as admin/moderator
|
2017-01-10 14:31:02 +01:00 |
|
Juanjo Bazán
|
f102f9f753
|
adds Budget::Investment to valid commentable types
|
2017-01-10 13:30:30 +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 |
|
Juanjo Bazán
|
220e7397e1
|
adds Setting: minimum age to participate
|
2017-01-09 16:04:49 +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 |
|
Alberto Garcia Cabeza
|
8722699cd8
|
fixes typos and spec for budgets investments
|
2017-01-08 22:17:14 +01:00 |
|
rgarcia
|
fd28f6c2b3
|
adds tags to investment
|
2017-01-08 11:37:02 +01:00 |
|
kikito
|
248755a801
|
Modifies the investment orders shown by phase
|
2017-01-05 17:38:36 +01:00 |
|
rgarcia
|
c3380d18fa
|
fixes conflicts with budgets
|
2017-01-05 13:14:09 +01:00 |
|
Fernando Blat
|
6c8060af38
|
Check the field is present before validating it
|
2017-01-05 12:45:27 +01:00 |
|
Fernando Blat
|
de13574617
|
Show link to the first question
|
2017-01-05 12:31:20 +01:00 |
|
Fernando Blat
|
450fcc3e04
|
Use SQL to sum the comments
|
2017-01-05 11:14:12 +01:00 |
|
Fernando Blat
|
814cf9df56
|
Show creation date and status in admin list
|
2017-01-05 10:22:40 +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
|
4ceeb68a90
|
changes abilities extending valuation period
|
2017-01-04 15:59:36 +01:00 |
|
kikito
|
b289e21992
|
Refactors valid_heading
|
2017-01-04 13:56:54 +01:00 |
|
kikito
|
f5dcb51d37
|
Adds valid_heading validation to budget line. Renames validation methods.
|
2017-01-04 13:56:42 +01:00 |
|
kikito
|
08586d521b
|
Refactors heading.budget . adds heading.budget_id
|
2017-01-04 13:54:07 +01:00 |
|
Amaia Castro
|
ee9fa3db15
|
Base Legislation Annotations
|
2017-01-04 12:56:58 +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 |
|
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 |
|
Amaia Castro
|
1ff6a7b69b
|
Merge branch 'legislation-module-stable' into 42-integrate-admin-html-css
|
2017-01-02 18:03:55 +01:00 |
|
kikito
|
68d598a43d
|
Merge branch 'master' into budgets
|
2017-01-02 12:10:23 +01:00 |
|
Amaia Castro
|
3de48353da
|
Merge branch 'master' into legislation-module-stable
|
2017-01-02 11:56:17 +01:00 |
|
kikito
|
451179fa59
|
fixes issues with valuating in specs
|
2017-01-02 08:22:11 +01:00 |
|
kikito
|
9e4b2fda89
|
Adds phases to form
|
2017-01-01 15:03:58 +01:00 |
|
kikito
|
ecb3461a97
|
Renames Budget::VALID_PHASES to just PHASES
|
2017-01-01 13:16:22 +01:00 |
|
kikito
|
d80dedaad8
|
Adds sanitized descriptions for all phases to budget model
|
2017-01-01 12:51:17 +01:00 |
|
kikito
|
c17dcf1bab
|
replaces array of strings with %w
|
2017-01-01 12:50:40 +01:00 |
|
kikito
|
f6e4443437
|
Removes sanitizable from budget, replacing it by custom impl
|
2017-01-01 12:34:15 +01:00 |
|