consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,781 Commits 1 Branch 0 Tags
a68fd80f76e0c5a7150facc0a2daa867aa3df90c
Commit Graph

6781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bertocq
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33:58 +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
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
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
iagirre
2621d2694b Added test for comments 2017-09-13 16:04:45 +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
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
BertoCQ
d01811dd5c Merge pull request #1844 from consul/polls-persist-officer-data 
Persist a shift's officer data
 2017-09-11 12:36:18 +02:00
María Checa
bd11e724b5 Merge pull request #1846 from Nimblersoft/documentation-fixes 
Added a couple of steps for linux installation guidelines
 2017-09-11 10:42:06 +02:00
Eric Aguayo
b228e17cae Update dev_test_setup_linux.md 
Added additional postgresql dependencies packages needed as well as some guidelines in case of database template encoding mismatch.
 2017-09-10 21:09:22 -05: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
f24a06b047 Merge pull request #1840 from consul/poll-shifts-search-officers 
Poll shifts search officers
 2017-09-11 00:07:26 +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
BertoCQ
4f26542f6c Merge pull request #1845 from consul/polls-available-booths 
Available booths to assign shifts
 2017-09-10 20:45:46 +02:00
rgarcia
4d1f61a87e adds specs 2017-09-08 22:00:50 +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
90a5053ca8 Correct consul github url on how to use translations 2017-09-08 14:55:08 +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
b1abb9dbb3 adds specs 2017-09-07 22:39:03 +02:00
rgarcia
d3890d1432 updates translations 2017-09-07 22:38:54 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
Bertocq
2fafb067cc Include custom localization folders on i18n config by default 2017-09-07 19:12:42 +02:00
María Checa
fb5211f251 Fixed test 2017-09-07 17:51:55 +02:00
María Checa
27ac4c5815 Added poll questions documents and video specs 
New tests to ensure video URL is shown in the admin preview. Also that the video URL and documents are correctly saved after creating a question.
 2017-09-07 17:19:07 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00