BertoCQ
73c47dcd0e
Merge pull request #1905 from wairbut-m2c/iagirre-autocomplete-tags
...
Iagirre autocomplete tags
2017-09-26 10:19:34 +02:00
Bertocq
43758ba830
Fix Style/EmptyCaseCondition rubocop issue
2017-09-25 22:52:38 +02:00
Bertocq
c5059f7292
Fix Style/ParenthesesAroundCondition rubocop issues
2017-09-25 22:46:09 +02:00
Bertocq
22822aa173
Fix Style/RedundantParentheses rubocop issues
2017-09-25 22:44:58 +02:00
iagirre
f7e96067b0
Actions for budgets' headings added. Edit headings, delete headings if not budget investments associated and add link in order to see budgets investments filtered by the heading.
...
Cambios para hacer commit:
modificado: app/controllers/admin/budget_headings_controller.rb
modificado: app/models/budget/heading.rb
nuevo archivo: app/views/admin/budget_headings/_errors.html.erb
nuevo archivo: app/views/admin/budget_headings/edit.js.erb
nuevo archivo: app/views/admin/budget_headings/update.js.erb
modificado: app/views/admin/budgets/_group.html.erb
nuevo archivo: app/views/admin/budgets/_heading.html.erb
nuevo archivo: app/views/admin/budgets/_heading_form.html.erb
modificado: config/locales/en/activerecord.yml
modificado: config/locales/es/activerecord.yml
modificado: spec/features/admin/budgets_spec.rb
modificado: spec/models/budget/heading_spec.rb
2017-09-25 15:40:17 +02:00
María Checa
02fa3a83b5
Custom tags for Legislation Process available
...
Custom tags for Legislation Processes, editable in the admin section.
2017-09-22 17:16:04 +02:00
María Checa
ebfa3fb011
Disallow users to edit their legislation proposals
2017-09-22 11:39:17 +02:00
María Checa
ac5620c583
Merge branch 'master' into 1856-legislation_processes_proposals_phase
2017-09-21 21:24:56 +02:00
iagirre
4db2584f87
The tags are suggested based on the entries the user makes.
...
Cambios para hacer commit:
modificado: app/assets/javascripts/tag_autocomplete.js.coffee
modificado: app/assets/stylesheets/autocomplete_overrides.scss
nuevo archivo: app/controllers/tags_controller.rb
modificado: app/models/abilities/common.rb
modificado: app/views/debates/_form.html.erb
modificado: app/views/proposals/_form.html.erb
modificado: config/initializers/acts_as_taggable_on.rb
modificado: config/routes.rb
modificado: spec/lib/acts_as_taggable_on_spec.rb
2017-09-21 18:21:45 +02:00
María Checa
57c48fe596
Legislation proposals comments working
2017-09-21 17:13:12 +02:00
María Checa
5ae8cda0d5
Fixed legislation proposal vote action
2017-09-21 16:23:34 +02:00
María Checa
ba041f90c8
Removed unnecessary parts in Legislation Proposals
2017-09-21 16:17:11 +02:00
BertoCQ
34568567a3
Merge pull request #1885 from consul/chore/remove_final_recounts
...
Remove Poll Final Recounts, replace with Total Results
2017-09-20 23:00:03 +02:00
BertoCQ
f67ba62c49
Merge branch 'master' into user-recomendations
2017-09-19 18:56:12 +02:00
BertoCQ
5d6c4f0bbc
Merge pull request #1868 from wairbut-m2c/aperez-validate-poll-question-is-selected
...
Validate presence 'poll_id' attribute on Poll::Question model
2017-09-19 18:15:32 +02:00
Bertocq
d9575baaab
Correct end at file ending
2017-09-19 17:30:40 +02:00
María Checa
c1672bdbf4
Legislation proposals adaptation in some models and initializers
2017-09-19 10:10:10 +02:00
Bertocq
2e3b5aad49
Totally remove Poll::FinalRecount model, table spec and factory
2017-09-19 01:22:30 +02:00
Bertocq
a3bf69e78d
Remove final result usage on admin poll officer assignments results
2017-09-19 01:13:04 +02:00
Bertocq
485b94eab9
Correct end at file ending
2017-09-15 14:06:26 +02:00
BertoCQ
87eeefff41
Merge pull request #1867 from consul/chore/rubocop_autocorrections
...
🤖 Rubocop autocorrections
2017-09-15 14:04:01 +02:00
BertoCQ
87c99018e7
Merge branch 'master' into user-recomendations
2017-09-14 23:45:56 +02:00
Angel Perez
0611e0f4ea
Validate presence of 'poll_id' attribute on Poll::Question model
...
Fixes #1831
On branch aperez-validate-poll-question-is-selected
Changes to be committed:
modified: app/models/poll/question.rb
modified: spec/models/poll/question_spec.rb
modified: spec/features/admin/poll/polls_spec.rb
2017-09-14 11:52:19 -04:00
María Checa
393e9f2b6a
Added permissions for Legislation:Proposal
2017-09-14 17:38:42 +02:00
Bertocq
e4e78c8f16
Rubocop autocorrections
2017-09-14 15:08:35 +02:00
Bertocq
1f867fb227
Add new model Poll Total Result with specs and relations
2017-09-14 13:51:27 +02:00
María Checa
335399e571
Created Legislation Proposals model
2017-09-14 12:50:48 +02:00
María Checa
f521a9023b
Added Proposal model to Legislation
...
This new Legislation::Proposal model inherits from the original Proposal, as it will behave in a very similar way.
2017-09-13 15:43:36 +02:00
Angel Perez
2181a65bc2
Allow only YouTube/Vimeo URLs on 'video_url' attribute
...
Fixes #1841
On branch aperez-valid-video-url
Changes to be committed:
modified: app/models/proposal.rb
modified: spec/factories.rb
modified: spec/models/proposal_spec.rb
Allow only YouTube/Vimeo URLs on 'video_url' attribute
Fixes #1841
On branch aperez-valid-video-url
Changes to be committed:
modified: app/helpers/embed_videos_helper.rb
modified: app/models/proposal.rb
modified: spec/features/management/proposals_spec.rb
modified: spec/features/proposals_spec.rb
modified: spec/features/tags/proposals_spec.rb
modified: spec/models/proposal_spec.rb
2017-09-13 08:35:59 -04:00
María Checa
dc9fe973f4
Added proposals phase attributes to legislation processes form
...
Also added them to the list of accepted params and completed translations.
2017-09-13 12:33:16 +02:00
BertoCQ
fa8b9a69a3
Merge branch 'master' into polls-persist-officer-data
2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3
Merge pull request #1835 from consul/1677-poll_questions_documents
...
Poll questions document and video
2017-09-11 00:08:31 +02:00
rgarcia
45d2fdd201
adds available booths
2017-09-08 21:59:54 +02:00
rgarcia
47564a91a0
persist a shift's officer data
2017-09-08 20:08:45 +02:00
María Checa
9f2522c106
Merge branch 'master' into 1677-poll_questions_documents
2017-09-06 18:28:31 +02:00
taitus
9b6b57a24c
Remove all white spaces
2017-09-06 14:12:32 +02:00
taitus
25560a27fc
Refactor Community model.
2017-09-06 14:07:44 +02:00
taitus
c5cb463a2e
Refactor helpers.
2017-09-06 13:47:29 +02:00
taitus
64774b0d2d
Refactor topics controller. Add Common abilities. Add destroy action.
2017-09-06 13:30:12 +02:00
María Checa
4af44a45a1
Documents upload for questions working
2017-09-06 12:00:46 +02:00
Raimond Garcia
2519f232ab
Merge branch 'master' into user-recomendations
2017-09-05 17:15:42 +02:00
Raimond Garcia
6f9d48f0eb
Merge branch 'master' into community
2017-09-05 15:40:03 +02:00
Raimond Garcia
eb4528eaa0
Merge branch 'master' into poll-shifts
2017-09-05 14:45:31 +02:00
taitus
8d0ba0bf5e
Display tag author only proposal or budget investment author
2017-09-05 12:55:12 +02:00
taitus
90518d4f99
Refactor participants. Add scopes on User.
2017-09-05 12:54:32 +02:00
taitus
0d76004636
Simplify and refactor method to calculate community participants
2017-09-05 12:54:32 +02:00
taitus
74958b461a
Add new model concern Communitable with relation, callback and associate community.
2017-09-05 12:54:32 +02:00
taitus
895c942a39
Add community to investments
2017-09-05 12:52:45 +02:00
taitus
4539c5fa00
Refactor and tests.
2017-09-05 12:52:14 +02:00
taitus
a1d37fa6c4
Add order on topic index.
2017-09-05 12:51:08 +02:00
