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

2653 Commits

Author SHA1 Message Date
decabeza
87676f5296 include lorem ipsum content on polls show 2017-10-04 10:12:54 +02:00
decabeza
ad08303dfd removes question link on polls index 2017-10-04 10:12:54 +02:00
decabeza
1b3cdc181d improves polls show layout 2017-10-04 10:12:54 +02:00
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
fbbbd38932 Merge pull request #1965 from consul/polls-voting 
Polls voting
 2017-10-02 22:25:51 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
356eb4ca8a Merge pull request #1959 from consul/polls-index 
Polls index view
 2017-10-02 21:42:59 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish 
Imageable polish
 2017-10-02 21:42:15 +02:00
BertoCQ
01e4447050 Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results 
Admins can see the preview of the budgets' results before the balloti…
 2017-10-02 21:40:04 +02:00
María Checa
e464985114 Minor fix 
Removed unnecessary markdown
 2017-10-02 20:34:38 +02:00
Raimond Garcia
a743b6b823 Merge branch 'master' into polls-voting 2017-10-02 17:11:21 +02:00
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
rgarcia
085991c624 allows voting only in one origin: booth or web 2017-10-02 16:22:31 +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
decabeza
f497227e3f improves layout for polls index view 2017-10-02 12:24:31 +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
decabeza
1a0467d2c6 adds data equalizer watch to prevent js errors 2017-09-29 09:23:05 +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
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
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
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
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
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
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
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