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

2516 Commits

Author SHA1 Message Date
BertoCQ
0eb33bbcd4 Merge pull request #1910 from consul/filter-subnav 
Filter subnav
 2017-09-25 19:02:30 +02:00
BertoCQ
a1a74f59bf Merge pull request #1911 from consul/legislation-process 
Legislation process SCSS
 2017-09-25 19:00:42 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design 
Admin design
 2017-09-25 17:23:17 +02:00
decabeza
e404d149ce fixes some lint errors on legislation_process.scss 2017-09-22 19:10:39 +02:00
decabeza
ad63b0a7d7 makes filter subnav same style than order links 2017-09-22 18:20:21 +02:00
Bertocq
3c2b5281e8 Fix Admin Polls menu active flags 2017-09-22 18:05:53 +02:00
BertoCQ
d58d71b98d Merge pull request #1898 from consul/clean-css 
Clean CSS
 2017-09-21 10:24:03 +02:00
BertoCQ
52954a480e Merge pull request #1892 from consul/subnavigation 
Active class on subnavigation
 2017-09-21 10:22:45 +02:00
decabeza
80e24d6c13 changes h2 titles upcase to prevent broke specs 2017-09-21 00:58:39 +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
decabeza
b43e464292 renames js class 2017-09-20 19:27:11 +02:00
decabeza
b291547bae replaces unnecessary css class 2017-09-20 19:07:08 +02:00
decabeza
3e85961657 fixes duplicated active class on subnavigation 2017-09-20 12:55:34 +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
5ffac1d1fb remove extra line break 😅 2017-09-20 01:38:32 +02:00
decabeza
3e2c639137 moves stats and setting links to header into a partial 2017-09-20 01:38:32 +02:00
decabeza
90f2b84856 improves admin header layout 2017-09-20 01:38:32 +02:00
decabeza
8ed791e860 includes description text on admin dashboard index 2017-09-20 01:38:32 +02:00
decabeza
28a6583199 removes untranslated texts on admin dashboard index 2017-09-20 01:38:32 +02:00
decabeza
73b61e8596 adds and removes spaces :neckbeard: 2017-09-19 20:38:08 +02:00
decabeza
1f58dd7545 removes hash comment id on comment replies link 2017-09-19 20:36:57 +02:00
Carlos Ruiz
cf2dff1013 Small class names and html refactor 2017-09-19 20:11:06 +02:00
BertoCQ
8cbdc5a6fd Merge pull request #1874 from wairbut-m2c/iagirre-admin-menu-wrongful-active-items 
When "Profiles" submenus are selected, the "Site custom" menu doesn't…
 2017-09-19 18:52:44 +02:00
decabeza
42749b0389 avoids use class variables on helper 2017-09-19 17:30:40 +02:00
decabeza
fc3eac7e8e refactors proposal helper and use correctly on proposal show view 2017-09-19 17:30:40 +02:00
decabeza
adc71faf1c moves author actions to sidebar on proposal show 2017-09-19 17:30:40 +02:00
Bertocq
c5671ed462 Use correct Predicate name on function 2017-09-19 17:30:40 +02:00
BertoCQ
8c943c5c68 Merge pull request #1876 from consul/chore/rubocop_fixes 
Manual 🤖  rubocop fixes
 2017-09-19 11:22:18 +02:00
Bertocq
630a3252b7 Fix admin poll officers assignments by officer view 2017-09-19 01:38:02 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +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
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
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
20aca263d7 Use correct Predicate name on function 2017-09-15 14:06:20 +02:00
iagirre
4bcb9ba81b Extra indentation spaces erased. 2017-09-15 13:19:58 +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
Bertocq
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33:58 +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
b597395768 Merge pull request #1860 from consul/help-headers 
Help headers
 2017-09-13 19:19:34 +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
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