consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,814 Commits 1 Branch 0 Tags
5d6c4f0bbc431a38eee67df7d844d90191cb1253
Commit Graph

4141 Commits

Author SHA1 Message Date
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
e4abe0d75a Merge pull request #1849 from rockandror/documentable-fix 
Documentable fix
 2017-09-19 17:07:25 +02:00
BertoCQ
8c943c5c68 Merge pull request #1876 from consul/chore/rubocop_fixes 
Manual 🤖  rubocop fixes
 2017-09-19 11:22:18 +02:00
decabeza
4ce06fac4e avoids use class variables on helper 2017-09-18 17:52:36 +02:00
decabeza
1c6a873b6d refactors proposal helper and use correctly on proposal show view 2017-09-18 17:31:37 +02:00
decabeza
cacd99648e fixes margin of tags on proposal show 2017-09-18 14:22:02 +02:00
decabeza
2b3cbac5bc moves author actions to sidebar on proposal show 2017-09-18 14:21:38 +02:00
BertoCQ
8cae97d98d Merge pull request #1853 from wairbut-m2c/mlucena-admin-menu 
20170912 - Disabled user questions for polls into budgets view.
 2017-09-18 10:11:31 +02:00
Bertocq
485b94eab9 Correct end at file ending 2017-09-15 14:06:26 +02:00
Bertocq
20aca263d7 Use correct Predicate name on function 2017-09-15 14:06:20 +02:00
Bertocq
a3428ee589 Use snake_case for method names 2017-09-15 14:06:17 +02:00
BertoCQ
87eeefff41 Merge pull request #1867 from consul/chore/rubocop_autocorrections 
🤖 Rubocop autocorrections
 2017-09-15 14:04:01 +02:00
Bertocq
7be1f0315e Update Officing Polls final condition up to 2 weeks after poll ending 2017-09-15 12:37:42 +02:00
Manuel Lucena
e93ac4e570 20170915 - fixed additional spacing and implemented suggested change of controller conditions 2017-09-15 11:10:48 +02:00
Manuel Lucena
823031af31 20170915 - Fixed behavior for sub menus under legislation section 
On branch mlucena-admin-menu
 Changes to be committed:
	modified:   app/views/admin/_menu.html.erb
 2017-09-15 10:59:58 +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
bae6669165 Remove final recount button from officing 2017-09-14 13:37:47 +02:00
Bertocq
27d56ad104 Refactor officing polls #final method to be cleaner 2017-09-14 12:57:04 +02:00
BertoCQ
b597395768 Merge pull request #1860 from consul/help-headers 
Help headers
 2017-09-13 19:19:34 +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
fb5fb866b5 Added space after <% and before %> in order to maintain consistency in the ERB code. Review of PR. 2017-09-13 17:44:11 +02:00
Manuel Lucena
2c2646d0a7 20170912 - Disabled user questions for polls into budgets view. … 
Committer: Manuel Lucena <mlucenap@venet.com.ve>

 On branch mlucena-admin-menu
 Changes to be committed:
	modified:   app/views/admin/_menu.html.erb
 2017-09-13 17:40:55 +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
decabeza
6b0f9746ef improves margins on simple menus 2017-09-13 13:27:53 +02:00
decabeza
eccbe9f833 makes section header minimal 2017-09-13 13:27:37 +02:00
decabeza
e131fe9992 moves header description to footer 2017-09-13 13:23:41 +02:00
decabeza
7aa876f0a7 avoids button overflow on admin tags table 2017-09-12 21:36:24 +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
BertoCQ
4ba232a165 Merge pull request #1842 from consul/poll-subnavigation 
Polls subnavigation
 2017-09-10 20:46:34 +02:00
rgarcia
0ad24c1080 highlights correct item in admin menu 2017-09-08 22:00:45 +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
decabeza
503a375b2f includes question controller name on polls subnavigation 2017-09-08 18:41:46 +02:00
decabeza
3b4e80a34d improves layout and tables for polls shifts 2017-09-08 16:50:53 +02:00
Bertocq
da3ef02e2f Correctly indent admin login erb file 2017-09-08 12:45:20 +02:00
Bertocq
e8f95f4b5b Format link_to consistently 2017-09-08 12:39:23 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00
Raimond Garcia
d01b1476fd Merge pull request #1833 from rockandror/improve-community 
Improve community
 2017-09-07 11:11:55 +02:00
BertoCQ
f5f64f5a33 Merge pull request #1832 from consul/verification-consistency 
SMS verification consistency
 2017-09-06 21:46:11 +02:00
María Checa
3ff89b2476 CSS minor fix 2017-09-06 20:29:59 +02:00