consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,891 Commits 1 Branch 0 Tags
76400a8c23ba60b1e95044aca0fed0ff84c8b310
Commit Graph

7212 Commits

Author SHA1 Message Date
rgarcia
b623422805 allows users to change their vote without refreshing the page 2017-10-02 13:14:58 +02:00
Bertocq
1c85c8af79 Sort Shift recount and scrutiny dates 2017-10-02 13:08:55 +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
decabeza
f497227e3f improves layout for polls index view 2017-10-02 12:24:31 +02:00
Pedro
1e4862d1cb Merge pull request #2 from consul/master 
Merge 02/10/17
 2017-10-02 12:23:00 +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
Raimond Garcia
f68d86a2e5 Merge pull request #1824 from rockandror/user-recomendations 
User recomendations
 2017-09-29 19:02:03 +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
Pedro Ríos Flores
323b05f4de Issue #1901: Budget related entries in Management shouldn't appear if budgets are globally disabled. 2017-09-29 12:30:02 +02:00
Bertocq
07592f6b0d Correct Poll current/expired/incoming scopes and helper functions 2017-09-29 11:50:23 +02:00
decabeza
1a0467d2c6 adds data equalizer watch to prevent js errors 2017-09-29 09:23:05 +02:00
decabeza
f44f3f5bc1 fixes css to shows error messages correctly 2017-09-28 17:52:28 +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
Alessandro Cuoghi
20fd176b6a Change again margin-top to button.hollow 2017-09-28 17:13:45 +02:00
Alessandro Cuoghi
4eee5f6eba Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded. 2017-09-28 17:03:50 +02:00
decabeza
876a2b530b fixes lint warnings 2017-09-28 16:03:08 +02:00
decabeza
fd78eb30cc shows hr tag on forms only when expanded 2017-09-28 15:20:47 +02:00
decabeza
8aaa0cb718 adds data equalizer to fix height on items with images 2017-09-28 15:20:00 +02:00
Senén Rodero Rodríguez
92c774cdeb Merge with master 2017-09-28 13:36:20 +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
Bertocq
49b4af5e04 Add flash error for shift creation without date, increase spec 2017-09-28 10:53:15 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +02:00
decabeza
fff643db8c improves delete image button on proposal show 2017-09-28 09:16:08 +02:00
decabeza
33d9d2d005 adds new icon image 2017-09-28 09:15:46 +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
taitus
a0603985ef Refactor. 2017-09-27 14:51:35 +02:00
taitus
51c53b6f31 Add missing specs from Maps on New, Edit and Show. 2017-09-27 14:50: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
05350b0f40 Fix scss lint warnings 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
011ef41ae1 Add map location missing specs 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
053a87eb2c Refactor map locations helper 2017-09-27 14:49:08 +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
3b04f881e7 Fix map marker positioning. 2017-09-27 14:48:12 +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
a14bb77f49 Fix map location form fields ids definition. 2017-09-27 14:48:12 +02:00
Senén Rodero Rodríguez
874a951dd2 Add map locations helper. Allow to configure map marker edition on map instantiation at views. 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