consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,099 Commits 1 Branch 0 Tags
c6d2c56f0e95cf7f927b6a66bd3bbcb8bde7d33c
Commit Graph

8099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertocq
7be1f0315e Update Officing Polls final condition up to 2 weeks after poll ending 2017-09-15 12:37:42 +02:00
iagirre
d629aef3b9 When "Profiles" submenus are selected, the "Site custom" menu doesn't open. Moreover, when "Site custom" submenus are selected, the menu remains opened. 2017-09-15 12:33:31 +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
iagirre
5ca4a6052f Merge branch 'iagirre-display-datepicker-arrows' of github.com:wairbut-m2c/consul into iagirre-display-datepicker-arrows 2017-09-15 10:04:12 +02:00
iagirre
354d07c1a6 Changes suggested in the PR https://github.com/consul/consul/pull/1869 made. Use the icons of consul instead of icons from jquery-ui. 
Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	borrado:       app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
 2017-09-15 10:02:18 +02:00
BertoCQ
87c99018e7 Merge branch 'master' into user-recomendations 2017-09-14 23:45:56 +02:00
BertoCQ
a68fd80f76 Merge pull request #1866 from consul/1740#add_total_poll_recount 
Add Total Ballot poll recount, remove it from results
 2017-09-14 22:59:41 +02:00
BertoCQ
ce61adbfd2 Merge branch 'master' into iagirre-display-datepicker-arrows 2017-09-14 17:53:29 +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
90e1325293 Merge branch 'master' into 1740#add_total_poll_recount 2017-09-14 17:51:54 +02:00
Bertocq
e3a45baa37 Fix password_changed_at default date to 01-01-2015 2017-09-14 17:49:45 +02:00
María Checa
393e9f2b6a Added permissions for Legislation:Proposal 2017-09-14 17:38:42 +02:00
iagirre
a7e570ed24 Added new line at the end of the file. 2017-09-14 17:09:02 +02:00
iagirre
f1eb535bde The arrows of the datepicker for changing the month didn't appear. There was a link for it, but no icons. The CSS file "theme" from jquery-ui was missing. 
Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	nuevo archivo: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
 2017-09-14 16:54:49 +02: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
María Checa
0ed6b0da6b Added Legislation Proposals views 2017-09-14 12:52:03 +02:00
María Checa
0245605f19 Added Legislation Proposals controller 2017-09-14 12:51:36 +02:00
María Checa
335399e571 Created Legislation Proposals model 2017-09-14 12:50:48 +02:00
María Checa
929e81a878 Added proposals phase to key dates 2017-09-14 12:49:13 +02:00
BertoCQ
93323cb917 Merge pull request #1861 from consul/chore/move_docs_to_docs_repo 
Move Documentation to consul/docs and reference it
 2017-09-13 19:58:48 +02:00
Bertocq
18a9564061 Remove brand guidelines from readme on to decide.es website 2017-09-13 19:48:06 +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
Bertocq
6a8afcd0c0 Add back basic installation/test/usage tips 2017-09-13 19:09:18 +02:00
Angel Perez
0b708397df Add base controller for Admin:Poll controller 
Fixes #1848

On branch aperez-fix-for-issue-1848
  Changes to be committed:
    new file:   app/controllers/admin/poll/base_controller.rb
    modified:   app/controllers/admin/poll/booth_assignments_controller.rb
    modified:   app/controllers/admin/poll/booths_controller.rb
    modified:   app/controllers/admin/poll/officer_assignments_controller.rb
    modified:   app/controllers/admin/poll/officers_controller.rb
    modified:   app/controllers/admin/poll/polls_controller.rb
    modified:   app/controllers/admin/poll/questions_controller.rb
    modified:   app/controllers/admin/poll/recounts_controller.rb
    modified:   app/controllers/admin/poll/results_controller.rb
    modified:   app/controllers/admin/poll/shifts_controller.rb
 2017-09-13 12:22:57 -04:00
decabeza
fb44a931df fixes legislation key dates with new proposal dates 2017-09-13 17:45:56 +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
iagirre
78c231bef6 Added db/schema after migration 2017-09-13 17:34:58 +02:00
iagirre
2621d2694b Added test for comments 2017-09-13 16:04:45 +02:00
María Checa
c811fd46f0 Proposals description migration and form 
- Added to legislation processes a new attribute called `proposals_description`.
- Then created new views to show a form for the `@process` to edit this attribute **from in the proposals section**.
- Completed translations for new views.
 2017-09-13 15:48:07 +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
Bertocq
392d633d24 Remove documentation already at consul/docs and reference to it on README files 2017-09-13 14:44:29 +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
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
María Checa
bc218531b0 Proposals phase migration 2017-09-13 12:31:42 +02:00
BertoCQ
e573ab72f7 Merge pull request #1857 from consul/admin-tags 
Admin tags
 2017-09-13 11:45:51 +02:00
decabeza
7aa876f0a7 avoids button overflow on admin tags table 2017-09-12 21:36:24 +02:00
Bertocq
7a2e5a4ecb Verify poll officer user on dev seeds 2017-09-11 16:48:45 +02:00