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
iagirre
b3db7d28f6
Add style class for editing form
2017-12-13 15:58: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
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
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
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
f9e65b0f80
Merge pull request #2102 from wairbut-m2c/iagirre-admin-poll-stats
...
Iagirre admin poll stats
2017-11-29 20:07:53 +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
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
Bertocq
8bef6d81c8
Fix value for metatag, and use twitter_handle settings value
2017-11-27 13:23:47 +01:00
decabeza
fe987dd7e9
removes unnecessary blank spaces 🙈
2017-11-24 14:29:40 +01:00
decabeza
ccbd99f88b
improves social media meta tags partial with settings
2017-11-24 14:13:45 +01:00
decabeza
7fcbd99311
adds social media meta tags to welcome index page
2017-11-24 14:13:19 +01:00
decabeza
69625b7d34
fixes url images on social meta tags partial
2017-11-24 10:58:16 +01:00
decabeza
81392ae8f2
Merge branch 'master' into community-design
2017-11-21 20:52:05 +01:00
BertoCQ
104a26db35
Merge pull request #2110 from wairbut-m2c/aperez-remove-valuator-role
...
Add option to unassign Valuator role
2017-11-21 16:34:16 +01:00
BertoCQ
ae71f4960b
Merge pull request #2068 from ortegacmanuel/add-investment-user-tags-admin-interface
...
Add investment user tags admin interface
2017-11-19 14:42:01 +01:00
Bertocq
b2e59272cc
Use kaminari url path helper on kaminari partials
2017-11-18 10:44:52 +01:00
Angel Perez
4e086de493
Add 'Delete' button to Valuators index/search views
2017-11-17 13:12:26 -04:00
Angel Perez
ab9d612128
'Proposals' feature can be enabled/disabled
...
Fixes #1886
2017-11-17 13:10:55 -04:00
Manuel Ortega
0a2dae8672
Fixed link back from moderation dashboard to root_path
...
Passing the organization name to the locale yml file
2017-11-15 19:23:03 +01:00
Raimond Garcia
ad37606129
Merge branch 'master' into legislation-processes-documents
2017-11-08 11:31:09 +01:00
iagirre
bfcbb6c0ad
Validation in model and in form added. When users makes the on focus on population field an explanation appears. Some specs added to test the model validations
2017-10-31 13:04:30 +01:00
iagirre
4b8a471d38
Specs added to test the functionality and some UI modified to make test pass
2017-10-30 16:50:25 +01:00
iagirre
1077e25b2b
Shifts are destroyed when a booths is unassigned. An alert appears if there are shifts, but it doesn't if there aren't.
2017-10-30 12:36:07 +01:00
iagirre
89425f50ef
First steps to destroy shifts when booth_assignments are destroyed
2017-10-27 14:57:32 +02:00
iagirre
b854d99248
Assign/Unassign button for expired polls is disabled
2017-10-27 13:10:10 +02:00
Alberto García
164bc19b3e
Merge pull request #1906 from consul/1856-legislation_processes_proposals_phase
...
[WIP] Legislation Process Proposals
2017-10-27 12:41:09 +02:00
María Checa
4e06fc52ce
Removed question, external_url and responsible_name fields from legislation proposal form
2017-10-27 10:40:28 +02:00
decabeza
392a787a2d
hides only the create button
2017-10-26 19:09:02 +02:00
decabeza
69f29b4f49
shows create button and categories only if proposals phase is open
2017-10-26 19:07:47 +02:00
