Commit Graph

2098 Commits

Author SHA1 Message Date
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design
Admin design
2017-09-25 17:23: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
Raimond Garcia
b416d2846e Merge pull request #1883 from xarlybovi/switch-flags-ajax
Switch flag/unflag buttons on use via ajax
2017-09-20 12:21:56 +02:00
decabeza
1b3292690a updates spec of admin logo_header 2017-09-20 11:02:13 +02:00
Carlos Ruiz
61c9536697 Add flagging/unflagging rspec 2017-09-19 20:11:23 +02:00
Bertocq
9c6a974bec Fix wrong spectations after final result swap for total result 2017-09-19 18:54:37 +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
882723a58a fixes flaky spec
Adds random number to the proposal’s title, to avoid js popup
displaying similar proposals
2017-09-19 17:30:40 +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
rgarcia
92333e530f fixes flaky spec
Visits directly the page to avoid flakiness
2017-09-19 17:30:40 +02:00
rgarcia
aee34e643c removes unused expectation 2017-09-19 17:30:40 +02:00
rgarcia
d1aa01b9fa fixes flaky spec
Using correct resource in path
2017-09-19 17:30:40 +02:00
rgarcia
c128a0f21d removes obsolete legislations specs
Obsolete and flaky!
2017-09-19 17:30:40 +02:00
rgarcia
8db8049e49 fixes flaky spec
Reactivates feature setting after spec
2017-09-19 17:30:40 +02:00
Bertocq
bf37b8e5f9 Use datetime always with zone 2017-09-19 17:30:40 +02:00
Senén Rodero Rodríguez
6e3f9f9b32 Remove document cached_attachment value after destroy_upload action. 2017-09-19 17:30:40 +02:00
BertoCQ
e4abe0d75a Merge pull request #1849 from rockandror/documentable-fix
Documentable fix
2017-09-19 17:07:25 +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
3b76c7428b fixes flaky spec
Adds random number to the proposal’s title, to avoid js popup
displaying similar proposals
2017-09-19 15:14:29 +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
rgarcia
eb89d92320 fixes flaky spec
Visits directly the page to avoid flakiness
2017-09-19 15:14:29 +02:00
rgarcia
8e0f709cf0 removes unused expectation 2017-09-19 15:14:28 +02:00
rgarcia
20ca60732b fixes flaky spec
Using correct resource in path
2017-09-19 15:14:28 +02:00
rgarcia
b101b1f778 removes obsolete legislations specs
Obsolete and flaky!
2017-09-19 15:14:28 +02:00
rgarcia
a7ce8d5c70 fixes flaky spec
Reactivates feature setting after spec
2017-09-19 15:14:28 +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
851d397395 Replace FinalResult with TotalResult at admin Poll Recounts page 2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99 Replace FinalResult with TotalResult at admin BoothAssignment show 2017-09-19 00:45:13 +02:00
Bertocq
97fe464232 Use datetime always with zone 2017-09-15 14:06:29 +02:00
BertoCQ
87eeefff41 Merge pull request #1867 from consul/chore/rubocop_autocorrections
🤖 Rubocop autocorrections
2017-09-15 14:04:01 +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
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33:58 +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
Bertocq
f7568a394f Remove officing final recounts controller, spec and view 2017-09-14 13:39:21 +02:00
BertoCQ
e38f2908cb Merge pull request #1854 from wairbut-m2c/aperez-valid-video-url
Allow only YouTube/Vimeo URLs on 'video_url' attribute
2017-09-13 19:19:09 +02:00
BertoCQ
440c448ae4 Merge pull request #1862 from wairbut-m2c/iagirre-comments-empty-html
Iagirre comments empty html
2017-09-13 19:16:25 +02:00
iagirre
2621d2694b Added test for comments 2017-09-13 16:04:45 +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
iagirre
1356ea217b Erased extra empty HTML for comments without replies. Added .gitignore rules for Netbeans projects
Cambios para hacer commit:
	modificado:    .gitignore
	modificado:    app/assets/javascripts/comments.js.coffee
	modificado:    app/views/comments/_comment.html.erb
	modificado:    spec/features/comments/debates_spec.rb
2017-09-13 13:30:37 +02:00
Senén Rodero Rodríguez
4c225aac62 Remove document cached_attachment value after destroy_upload action. 2017-09-11 14:39:58 +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
BertoCQ
dd02c83fa3 Merge branch 'master' into poll-shifts-search-officers 2017-09-11 00:07:12 +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
rgarcia
b1abb9dbb3 adds specs 2017-09-07 22:39:03 +02:00
María Checa
fb5211f251 Fixed test 2017-09-07 17:51:55 +02:00