Alberto García
b4782f73f2
delete unnecessary parenthesis
2017-12-14 21:13:46 +01:00
Alberto García
1737f85398
Merge branch 'master' into aperez-dates-for-milestones
2017-12-14 20:50:55 +01:00
Alberto García
09b544774d
Merge pull request #2191 from wairbut-m2c/iagirre-add-documents-to-milestones
...
Add documents to milestones
2017-12-14 20:49:19 +01:00
BertoCQ
50b4f50eac
Merge branch 'master' into aperez-dates-for-milestones
2017-12-14 15:42:35 +01:00
Alberto García
45de7efd7a
Merge pull request #1904 from consul/community-design
...
Community design
2017-12-14 14:44:03 +01:00
Bertocq
831ca1dd67
Redirect anonymous user to sign in on create topic link
2017-12-14 13:50:42 +01:00
Alberto García
19925de06b
Merge pull request #2170 from consul/design
...
Design improvements
2017-12-14 11:31:31 +01:00
iagirre
01a8c55936
Make Budget::Investment::Milestone class Documentable.
...
Add fields to the milestone form so that the admin can attach 0, 1 or multiple documents.
Add column to milestone list with a link to documents (if there is any).
Make documents accessible from the milestone view for users.
2017-12-14 10:53:01 +01:00
Angel Perez
03ae14c613
End-users will be shown a milestone's publication date if available
2017-12-13 20:17:54 -04:00
Angel Perez
6d57d76071
Admins can add a 'publication date' to milestones
2017-12-13 20:17:54 -04:00
Raimond Garcia
97f549ac10
Merge pull request #2186 from wairbut-m2c/iagirre-add-images-to-milestones
...
Add Images to Milestones
2017-12-13 19:56:04 +01:00
iagirre
b3db7d28f6
Add style class for editing form
2017-12-13 15:58:38 +01:00
Bertocq
8c9585480b
Remove no longer needed topics helper module file
2017-12-13 14:40:38 +01:00
Bertocq
8bfaee7267
Fix missing parenthesis on i18n.l method call
2017-12-13 14:21:20 +01:00
iagirre
59a4b93a00
Add I18n texts for milestone images.
...
Add specs to test admin image uploader and milestones' show.
Modify the UI to fit the mockups provided in the issue.
2017-12-13 14:03:46 +01:00
rgarcia
abaf6ab785
adds model validations for legislation proposals
2017-12-13 12:52:25 +01:00
iagirre
5186149b33
Add I18n texts for the link to see the image.
...
The image is shown in the public investment window if the milestone has one.
2017-12-13 08:59:54 +01:00
iagirre
35986ea6b5
Budget::Investment::Milestone is imageable
...
Admin form attaches an image
Milestone list has a column "Image", empty or with a link to the image
2017-12-13 08:59:36 +01:00
Raimond Garcia
d49a1dc208
Merge pull request #2172 from consul/notifications
...
Notifications for hidden resources
2017-12-12 16:26:37 +01:00
rgarcia
7465a8ef8e
Refactors li element
2017-12-12 13:36:38 +01:00
Bertocq
3139d760ec
Remove unuseful comment on imageable concern
2017-12-12 12:38:54 +01:00
rgarcia
e3c8dece8f
Makes the code aware of notifications for hidden commentables
2017-12-11 13:22:10 +01:00
Raimond Garcia
11e80fbc92
Merge pull request #1903 from wairbut-m2c/aperez-enable-disable-proposals
...
Add enable/disable option for 'Proposals' feature
2017-12-08 11:41:13 +01:00
decabeza
377a1d9f01
improves following view and updates specs
2017-12-07 16:31:05 +01:00
decabeza
d273ba2ba5
improves following page, shows public interest only in this view
2017-12-07 13:40:12 +01:00
Raimond Garcia
22a8157165
Merge branch 'master' into aperez-email-specs-for-commentables
2017-12-07 13:05:25 +01:00
decabeza
e9ad4b49fb
improves styles for follow button
2017-12-07 11:12:46 +01:00
decabeza
39def428b5
improves layout for items list with images
2017-12-06 21:00:34 +01:00
decabeza
864c022b08
adds margin to maps on show views
2017-12-06 15:37:46 +01:00
María Checa
56e10f9532
Merge pull request #2160 from consul/relationables
...
Related Content model and Relatable concern
2017-12-05 15:19:42 +01:00
Bertocq
7339a98b74
Create installation controller with consul details method, add route on routes.rb
2017-12-04 18:32:04 +01:00
Bertocq
05a6c35b65
Switch case statement for if
2017-12-04 15:48:09 +01:00
Bertocq
b327420e72
Force setseed value range from -1 o 1
2017-12-04 15:42:59 +01:00
Bertocq
6d8657ab5c
Move css styles from custom file to correct admin.scss one
2017-11-30 11:45:51 +01:00
María Checa
f9e65b0f80
Merge pull request #2102 from wairbut-m2c/iagirre-admin-poll-stats
...
Iagirre admin poll stats
2017-11-29 20:07:53 +01:00
Bertocq
cd021aee4b
Add relationed_contents helper function on Relationable concern with spec
2017-11-29 19:02:25 +01:00
Bertocq
0482eb4098
Add report_related_content helper funcion on Relationable concern with spec
2017-11-29 19:02:25 +01:00
Bertocq
e02f511b3a
Add times_reported integer attribute to RelatedContent
2017-11-29 19:02:14 +01:00
Bertocq
04dfc98c3f
Create RelatedContent model spec to check relationable destroy
2017-11-29 19:01:50 +01:00
Bertocq
03f0534b2f
Add scenario to RelatedContent model spec to check opposite related content creation
2017-11-29 19:01:12 +01:00
Bertocq
13f5fa55ab
Use Relationable concern on Debates, Proposals and Budget Investments
2017-11-29 19:01:12 +01:00
Bertocq
8f3769aa7d
Create Relationable concern
2017-11-29 19:01:12 +01:00
Bertocq
a138cda364
Create RelatedContent model
2017-11-29 19:00:54 +01:00
BertoCQ
0df316be4c
Merge pull request #2158 from consul/fix/random_seed_order
...
Prevent a division by zero bug on sort by random scope
2017-11-29 16:05:58 +01:00
Alberto García
effab2988b
Merge pull request #1941 from periflo90/master
...
Issue #1901 : Budget related entries in Management shouldn't appear if budgets are globally disabled
2017-11-29 12:11:21 +01:00
Bertocq
c5fa85e3f6
Prevent a division by zero from happening on sort by random investment scope
2017-11-29 11:40:10 +01:00
BertoCQ
e7226dfca1
Merge pull request #2153 from consul/social-meta-tags
...
Social meta tags
2017-11-29 10:54:05 +01:00
María Checa
3984d6a947
Merge pull request #2115 from wairbut-m2c/iagirre-heading-population-restriction-validation
...
Iagirre heading population restriction validation
2017-11-28 20:06:53 +01:00
Raimond Garcia
9e12d67f3f
Merge pull request #2114 from wairbut-m2c/iagirre-booth-assignment-removal
...
Iagirre booth assignment removal
2017-11-28 19:59:20 +01:00
Raimond Garcia
778ddbee0f
Merge pull request #2131 from wairbut-m2c/iagirre-budget-pagination-bug
...
Iagirre budget pagination bug
2017-11-27 16:49:27 +01:00
