consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

267 Commits

Author SHA1 Message Date
María Checa
d786284ce9 Added newsletter custom stylesheets and js alert 2018-02-14 16:06:02 +01:00
BertoCQ
92eac29da7 Merge branch 'master' into budget_map 2018-01-18 00:36:43 +01:00
María Checa
4e5c8f4903 Added js file for alert 2018-01-17 19:11:46 +01:00
Vicente Mendoza
d0df965487 fix some issues about test and variables name 2018-01-17 17:10:19 +01:00
Vicente Mendoza
91e10e1897 new map on budget homepage 2018-01-17 13:15:35 +01:00
decabeza
97bf00817c fixes js class name 2018-01-15 21:21:44 +01:00
Raimond Garcia
bce0729a61 Merge pull request #1899 from xarlybovi/legislation-process-html-fixes 
Legislation process minor html fixes
 2018-01-08 16:00:26 +01:00
rgarcia
20dec19e89 toogles map visibility 2017-12-19 20:33:43 +01:00
María Checa
f9e65b0f80 Merge pull request #2102 from wairbut-m2c/iagirre-admin-poll-stats 
Iagirre admin poll stats
 2017-11-29 20:07:53 +01:00
iagirre
5a3e701e8d Polls' stats migrated from Madrid's fork and sortable functions added for tables 2017-10-23 13:19:22 +02:00
Manuel Ortega
9de9a81b8c Added reference to event on the .on method('ajax:success',... 2017-10-20 14:12:31 +02:00
Raimond Garcia
1c5a1d1677 Merge pull request #2054 from wairbut-m2c/iagirre-answer-resize-reorder 
Iagirre answer resize reorder
 2017-10-16 10:49:35 +02:00
iagirre
2c6c320fa1 When answer 2 more info expand is clicked, it expands on top of the first one, not below. Same if the expand is clicked for the first answer 2017-10-13 14:38:30 +02:00
rgarcia
560ff7c51d does not use custom implementation to disable submit button 2017-10-13 12:40:42 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +02:00
María Checa
e127b52225 Minor fixes 2017-10-07 11:37:33 +02:00
María Checa
cc2da735c7 Set token to 64 characters 2017-10-06 21:47:46 +02:00
María Checa
7e11a48f00 Fixed token message 2017-10-06 21:14:19 +02:00
María Checa
34cd8d8b98 Fixed token message 2017-10-06 20:59:25 +02:00
María Checa
bcfd1a844a Poll voter token 2017-10-06 20:44:47 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +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
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
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
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
Senén Rodero Rodríguez
0a86727c6a Move method 'recover_image_from_cache' from imageable controllers to image. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
d98d1312ca Add _destroy parameter to nested image 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
f8d78ec4ab Remove new_nested action from images controller. Use cocoon gem to manage new nested fields creation on images. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
88a7a29d27 Remove new_nested action from documents controller. Use cocoon gem to manage new nested fields creation on documents. 2017-09-26 13:57:13 +02:00
Alessandro Cuoghi
3745e76c07 Solve conflicts. Refactor documentable and imageable styles. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
95016a1bf3 Some renaming and cleaning 2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
34a0aa25b6 Documentable js script fix 2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
f9b207c488 Remove unused js script 2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
966ff4dc03 User new direct uploads controllers action on imageable. 2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
824dd26d5a User new direct uploads controllers action on documentable. Skipped spec. 2017-09-26 13:55:51 +02:00
Senén Rodero Rodríguez
826385f659 Extract ajax upload and destroy_upload actions from images and documents controllers and place them at new controllers to manage direct uploads 2017-09-26 13:55:28 +02:00
Senén Rodero Rodríguez
6f71da07ee Duplicate documentable code and rename for imageable 2017-09-26 13:55:03 +02:00
BertoCQ
73c47dcd0e Merge pull request #1905 from wairbut-m2c/iagirre-autocomplete-tags 
Iagirre autocomplete tags
 2017-09-26 10:19:34 +02:00
Carlos Ruiz
dc2e2a0944 Minor refactor and implement foundation toggler 2017-09-21 23:09:04 +02:00
iagirre
4db2584f87 The tags are suggested based on the entries the user makes. 
Cambios para hacer commit:
	modificado:    app/assets/javascripts/tag_autocomplete.js.coffee
	modificado:    app/assets/stylesheets/autocomplete_overrides.scss
	nuevo archivo: app/controllers/tags_controller.rb
	modificado:    app/models/abilities/common.rb
	modificado:    app/views/debates/_form.html.erb
	modificado:    app/views/proposals/_form.html.erb
	modificado:    config/initializers/acts_as_taggable_on.rb
	modificado:    config/routes.rb
	modificado:    spec/lib/acts_as_taggable_on_spec.rb
 2017-09-21 18:21:45 +02:00
Carlos Ruiz
c9ce560380 Legislation process minor html fixes 2017-09-20 23:34:27 +02:00
decabeza
b43e464292 renames js class 2017-09-20 19:27:11 +02:00
Carlos Ruiz
cf2dff1013 Small class names and html refactor 2017-09-19 20:11:06 +02:00
iagirre
049967649e Selection of multiple tags separated by ',' works for hardcoded array of tags. 2017-09-19 17:37:31 +02:00
Carlos Ruiz
12d34a3ea1 Switch flag/unflag buttons on use via ajax 2017-09-18 19:07:45 +02:00