Commit Graph

845 Commits

Author SHA1 Message Date
Senén Rodero Rodríguez
c399692109 Add image description to budget investments 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4f5a552486 Added image content type validation to only allowing jpg images. 2017-09-26 13:53:42 +02:00
iagirre
e90ac7e72d Admins can see the preview of the budgets' results before the balloting phase is finished.
Cambios para hacer commit:
	modificado:    app/models/abilities/administrator.rb
	modificado:    app/views/budgets/show.html.erb
	modificado:    spec/models/abilities/administrator_spec.rb
	modificado:    spec/models/abilities/everyone_spec.rb
2017-09-26 11:16:32 +02:00
Bertocq
7e4d9b749b Fix Style/ColonMethodCall rubocop issues 2017-09-25 22:53:15 +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
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
rgarcia
6de47e7f1d fixes flaky spec
Maybe using `build` instead of `create` was confusing the spec
2017-09-19 17:30:40 +02:00
BertoCQ
5cf862064d Merge pull request #1888 from consul/flaky-specs
Fixes some flaky specs
2017-09-19 16:43:41 +02:00
rgarcia
0de87c19c6 fixes flaky spec
Maybe using `build` instead of `create` was confusing the spec
2017-09-19 15:14:29 +02:00
Angel Perez
15ccef8c97 Poll::Question model spec refactor to improve DRYness
On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   spec/models/poll/question_spec.rb
2017-09-19 07:08:18 -04:00
Bertocq
2e3b5aad49 Totally remove Poll::FinalRecount model, table spec and factory 2017-09-19 01:22:30 +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
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
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
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
4d1f61a87e adds specs 2017-09-08 22:00:50 +02:00
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +02:00
Raimond Garcia
d01b1476fd Merge pull request #1833 from rockandror/improve-community
Improve community
2017-09-07 11:11:55 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
María Checa
288cedc4c4 Poll questions documents tests added 2017-09-06 18:25:41 +02:00
decabeza
1de763a737 removes deprecated specs 2017-09-06 18:07:46 +02:00
taitus
9b6b57a24c Remove all white spaces 2017-09-06 14:12:32 +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
da7b53acf4 Refactor spec. 2017-09-05 13:30:45 +02:00
taitus
3516c651c1 Fix community particpants spec 2017-09-05 12:55:12 +02:00
taitus
dcaa10147a Relocate User model spec to Community model spec. 2017-09-05 12:54:32 +02:00
taitus
4539c5fa00 Refactor and tests. 2017-09-05 12:52:14 +02:00
Alberto
c3b3a837a9 Merge branch 'master' into user-recomendations 2017-09-05 11:31:05 +02:00
Alberto
3cc904311a Merge branch 'master' into user-recomendations 2017-09-04 19:53:21 +02:00
Senén Rodero Rodríguez
0fbffdc73e Fix abilities definition and related specs 2017-08-25 18:34:53 +02:00
Senén Rodero Rodríguez
c92827e89e Add abilities to documentable authors and admins to create and destroy documents. 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
a141c82e33 Create new polymorphic model Document. 2017-08-25 17:27:37 +02:00
rgarcia
0aba196ba2 adds specs for shifts 2017-08-04 21:27:30 +02:00
taitus
edbbe6174b Refactor specs because now recommendations only return results asociated to user interests 2017-08-03 00:23:06 +02:00
Bertocq
ef81c277a0 Remove spending proposal specs, deprecated feature with flaky tests 2017-08-02 12:08:50 +02:00
taitus
33e13dbfd0 Add missing feature and model specs on proposal and debates. 2017-08-01 18:00:02 +02:00
taitus
c6a9ffc19c Remove recommended investments 2017-08-01 16:28:01 +02:00
taitus
f8c6422b30 Testing links on carousel. Improve tests descripions 2017-08-01 16:28:01 +02:00
taitus
56511a154a Add feature and model specs. 2017-08-01 16:28:01 +02:00
Bertocq
7d406cae76 Rubocop autocorrections 2017-07-25 13:01:03 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00