consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,983 Commits 1 Branch 0 Tags
0a668114d0800c780a76fd0cc9a58aa24401d77f
Commit Graph

7983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8c943c5c68 Merge pull request #1876 from consul/chore/rubocop_fixes 
Manual 🤖  rubocop fixes
 2017-09-19 11:22:18 +02:00
María Checa
c1672bdbf4 Legislation proposals adaptation in some models and initializers 2017-09-19 10:10:10 +02:00
María Checa
08d1e96575 Added migration to include legislation/proposals_count in tags table 2017-09-19 10:09:43 +02:00
María Checa
d83bb9e31f Legislation proposal controller adaptation 2017-09-19 10:08:36 +02:00
María Checa
8805037e2f Legislation proposal views changes 2017-09-19 10:08:01 +02:00
Bertocq
630a3252b7 Fix admin poll officers assignments by officer view 2017-09-19 01:38:02 +02:00
BertoCQ
9a2bfe90dd Merge pull request #1882 from consul/proposal-show 
Proposal show
 2017-09-19 01:24:54 +02:00
Bertocq
2e3b5aad49 Totally remove Poll::FinalRecount model, table spec and factory 2017-09-19 01:22:30 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +02:00
Bertocq
1c1bb7bf38 Remove no longer used functions 2017-09-19 01:12:24 +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
ba198726f2 Remove Netbeans folder from .gitignore 
Why:

* IDE/Text editor specific files and folders to be ignored should be on each developer's personal .gitignore_global file

How:

* If you're affected by this change, check https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 2017-09-19 00:34:41 +02:00
Carlos Ruiz
12d34a3ea1 Switch flag/unflag buttons on use via ajax 2017-09-18 19:07:45 +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
iagirre
b889d23fe6 Fixed width property, changed to top. 2017-09-18 08:19:47 +02:00
Bertocq
97fe464232 Use datetime always with zone 2017-09-15 14:06:29 +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
8bf0d6f749 Correct i18n tasks config to check for any file under custom language folder 2017-09-15 13:51:04 +02:00
iagirre
4bcb9ba81b Extra indentation spaces erased. 2017-09-15 13:19:58 +02:00
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