Commit graph

1337 commits

Author SHA1 Message Date
Connor Turland
2fe33f0f57 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-19 13:02:02 -05:00
Bashar Jabbour
0d709cecac updated the map contributors tooltip to match pseudo css 2014-11-18 23:24:43 -05:00
Connor Turland
604b01ba7d Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-18 20:48:05 -05:00
Connor Turland
d48bf872e4 updated user image to square one in topic helper 2014-11-18 20:47:54 -05:00
Bashar Jabbour
c4de02a958 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-18 14:50:17 -05:00
Bashar Jabbour
818042aeae added tooltip of map contributors in mapinfo lightbox 2014-11-18 14:48:50 -05:00
Connor Turland
4831307fe7 fixed user image proportions in synapse autocomplete 2014-11-16 15:22:29 -05:00
Connor Turland
fe5d682fc2 finished synapse autocomplete styling 2014-11-16 15:17:32 -05:00
Connor Turland
7182996134 removed other sidekiq stuff. 2014-11-16 12:39:41 -05:00
Connor Turland
951bd8d4a5 removed sidekiq leftovers. altered synapse results to only return unique 2014-11-16 12:35:06 -05:00
Connor Turland
23d5527adc lots of little fixes 2014-11-15 17:43:24 -05:00
Connor Turland
2cf91d39b4 another test for uservoice auto signout. this time with iframe and json 2014-11-14 21:19:14 -05:00
Connor Turland
beb05f1f39 another test for uservoice auto signout. this time with iframe 2014-11-14 21:11:51 -05:00
Connor Turland
dc37b280e1 another test for uservoice auto signout 2014-11-14 21:03:24 -05:00
Connor Turland
e0c9aba857 auto sign out of uservoice 2014-11-14 20:54:51 -05:00
Connor Turland
4e8dabba36 removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code 2014-11-14 20:21:16 -05:00
Connor Turland
ac40c0af48 touched up tooltips 2014-11-14 08:21:09 -05:00
Bashar Jabbour
508fc5c481 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-13 15:41:35 -05:00
Bashar Jabbour
79c5b88547 contributor tooltip styling 2014-11-13 15:41:24 -05:00
poietic
73fe5607db metacode icons 2014-11-12 18:52:05 -08:00
Bashar Jabbour
78455c6a35 Added capture screenshot tooltip 2014-11-12 13:40:00 -05:00
Bashar Jabbour
02d49c166a upated tooltips 2014-11-12 13:36:41 -05:00
Metamaps
842313bb07 updated the tooltips 2014-11-12 13:31:15 -05:00
poietic
a5aaa4ef3d added open data icons 2014-11-11 12:28:24 -08:00
Connor Turland
5175028ec1 added image for 'center topic' and 'get siblings' 2014-11-11 07:51:02 -05:00
Connor Turland
f1135854a0 fix for when mappings are corrupt 2014-11-11 07:23:44 -05:00
Connor Turland
8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -05:00
Connor Turland
534bdae495 little lightbox fix 2014-11-11 02:27:34 -05:00
Connor Turland
7a9f737fdb Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-11 02:23:48 -05:00
Connor Turland
9b0304c403 added filtering back to topic view 2014-11-11 02:23:39 -05:00
poietic
c285f53a57 added link to our collaborative spaces 2014-11-10 18:27:38 -08:00
poietic
cfe2ef9adb couple more tweaks. 2014-11-10 17:05:37 -08:00
poietic
1658c5fb5d lightbox content tweaks 2014-11-10 17:02:07 -08:00
Connor Turland
3bb8256f8f updated missing map image. added topic description signifier and relocated topic link signifier to top left. added synapse count signifier. 2014-11-10 17:58:15 -05:00
Connor Turland
20a6a9f443 another attempt at cross origin 2014-11-10 11:20:56 -05:00
Connor Turland
218716dee3 fixed cross origin image draw, so that canvas.toDataURL can work 2014-11-10 11:06:57 -05:00
Connor Turland
4adf0081b8 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-09 22:10:21 -05:00
Connor Turland
44923eb660 added new map screenshot capture method 2014-11-09 22:10:13 -05:00
poietic
0058002e02 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-11-08 21:59:17 -08:00
poietic
4437270a6b misc css tweaks 2014-11-08 21:52:46 -08:00
Connor Turland
d73fa37f57 tweaked donate and get involved html 2014-11-08 15:00:12 -05:00
Connor Turland
f124bcfdf3 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-08 14:08:05 -05:00
poietic
ea689f182c added Donate lightbox! more content changes
of about, get involved sections
2014-11-06 12:42:26 -08:00
Connor Turland
af65f8cb47 reset JIT for working with chrome and safari 2014-11-05 16:25:10 -05:00
Connor Turland
22695e53b8 restored graph plotting to normal 2014-11-05 15:47:43 -05:00
Connor Turland
dc4392ee95 trying requestAnimationFrame 2014-11-05 14:41:49 -05:00
Connor Turland
fc711d4863 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-05 13:26:27 -05:00
Connor Turland
7193d2a386 fixed small render node issue 2014-11-05 13:26:14 -05:00
Bashar Jabbour
ff1dbafe3d Update MacInstallation.md 2014-11-05 11:48:28 -05:00
Connor Turland
2bcead3900 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-05 11:44:09 -05:00