consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,169 Commits 1 Branch 0 Tags
cfbc5db9af97e845ca183d4d8b3234309d70304d
Commit Graph

536 Commits

Author SHA1 Message Date
Raimond Garcia
c7f576aa4f Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section 
Iagirre admin polls section
 2017-10-03 22:23:53 +02:00
María Checa
05d40c0ede Merge branch 'master' into polls_minor_changes 2017-10-03 16:22:33 +02:00
María Checa
bf61dffd4b Removed files that are not used 2017-10-03 10:47:48 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish 
Imageable polish
 2017-10-02 21:42:15 +02:00
María Checa
e464985114 Minor fix 
Removed unnecessary markdown
 2017-10-02 20:34:38 +02:00
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
iagirre
166caa3b4c Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first. 
Added missing text for english and new texts in english and spanish.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/participation.scss
	modificado:    app/models/concerns/imageable.rb
	modificado:    app/models/poll.rb
	modificado:    app/views/admin/poll/polls/_form.html.erb
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    config/locales/en/images.yml
	modificado:    config/locales/es/admin.yml
	modificado:    config/locales/es/images.yml
	modificado:    spec/features/admin/poll/polls_spec.rb
 2017-10-02 12:59:26 +02:00
María Checa
799e2475da Polls booth assignments fixes 
Poll booth preview now renders recounts tab by default instead of the officers one.
 2017-10-02 11:08:18 +02:00
María Checa
2c72a054ac Polls admin officer assignments fixes 
Removed total results table from officer assignment as now there are only final results.
 2017-10-02 11:04:37 +02:00
María Checa
2365ec96fa Polls admin officers tab fixes 
Removed actions offered in search results.
 2017-10-02 10:41:48 +02:00
María Checa
adf18ee756 Polls admin fixes 
Removed search from questions tab and unassign button.
 2017-10-02 10:37:10 +02:00
María Checa
fd1d09c8c2 Booths and shifts index pages minor fixes 
Showing only actions to assign and edit shifits in shifts index, and option to create a new booth in booths index.
 2017-10-02 10:25:11 +02:00
iagirre
c67620fdef Table for links added (links to add images/documents). 
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
 2017-09-29 14:51:49 +02:00
María Checa
14fe771fa5 Fixed wrong officer action path 
Before this change, when a user searched for an officer already assigned the ui was blocked because that path wasn't correct.
 2017-09-28 17:47:50 +02:00
iagirre
77d0a551cf Migration for adding summary and description to polls created. Both text_areas were added to polls form. 
Imageable class included in polls model and the first aproach for adding images added to form.
 2017-09-28 17:46:30 +02:00
María Checa
1e0aec37ab Removed link to poll question in the web in admin section 2017-09-28 17:37:31 +02:00
decabeza
876a2b530b fixes lint warnings 2017-09-28 16:03:08 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
Raimond Garcia
e590e31053 Merge pull request #1864 from rockandror/maps-frontend 
Maps frontend
 2017-09-28 12:53:17 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +02:00
Bertocq
f40a0d09ed Add Shift vote and recount date ranges, filter selected one on controller 2017-09-27 18:08:03 +02:00
decabeza
407c0fc702 fixes styles for filters, orders and subnavs on admin 2017-09-27 17:57:54 +02:00
Senén Rodero Rodríguez
c9963b1c4f Some alignment fixes 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
5a09b79da4 Move map tiles provider server and map tiles attribution to secrets. 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
5113fefef6 Change open street maps tile server url. 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
5815389cb8 Rename map settings keys 2017-09-27 14:49:07 +02:00
Senén Rodero Rodríguez
130e4533ac Allow to render map without marker on new forms. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
dd7afd3593 Add methods to map locations helper. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
5956207a00 Add map locations. Each map location can belongs to proposal or budget investment. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00
Bertocq
ce92dcd088 Add Task selection on Poll Shift creation, and on shifts table 2017-09-27 14:05:25 +02:00
Senén Rodero Rodríguez
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
BertoCQ
f2e44f0730 Merge pull request #1919 from consul/chore/remove_booth_assignment_officer_totals 
Remove Officer recounts, add Final&Totals votes
 2017-09-26 10:19:57 +02:00
decabeza
9de8ef2e14 sets data-multi-open to false on admin menu 2017-09-25 19:40:24 +02:00
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design 
Admin design
 2017-09-25 17:23:17 +02:00
Bertocq
3c2b5281e8 Fix Admin Polls menu active flags 2017-09-22 18:05:53 +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
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
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
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
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