Commit graph

1091 commits

Author SHA1 Message Date
Connor Turland 54bb3d2c3d updated the 404 page. fixed merge conflicts. removed generation code 2014-11-23 22:58:30 -05:00
Connor Turland e9114a309f fixed up map info box issues, finished up search tooltips 2014-11-23 22:28:29 -05:00
Bashar Jabbour b077dd6010 added tooltip in search results for map 2014-11-22 23:05:31 -05:00
Bashar Jabbour 13118d0ea9 fixed firefox synapse card styling 2014-11-22 20:49:59 -05:00
Bashar Jabbour 7bf87c7a4b fixed label placement on safari 2014-11-22 20:04:23 -05:00
Bashar Jabbour 5725007e78 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-22 19:35:15 -05:00
Bashar Jabbour 23510f2f87 added user image stack for map search results and associated tooltip 2014-11-22 19:35:03 -05:00
Connor Turland c1728b9ecb fixed mouse mappings 2014-11-22 16:47:09 -05:00
Connor Turland 2de697bcca ensured that new users can sign up with other new users invite codes 2014-11-21 17:24:08 -05:00
Connor Turland a9e488d9cb NOTE: rake db:migrate required. added generation column to users 2014-11-21 16:50:42 -05:00
Connor Turland 0ebc3dbc37 filter and realtime button active states. zoomExtents excludes filtered topics 2014-11-21 15:45:44 -05:00
Connor Turland e9a39f9838 made map contributors toggle visibility on click 2014-11-20 22:50:47 -05:00
Connor Turland a20f6b760f finished up map info box in terms of dynamically switching pages to other maps. styled other tips. 2014-11-19 22:42:14 -05:00
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 38c3ba419c Merge branch 'develop' into tvw 2014-11-11 07:51:22 -05:00
Connor Turland 5175028ec1 added image for 'center topic' and 'get siblings' 2014-11-11 07:51:02 -05:00
Connor Turland d673172abf Merge branch 'develop' into tvw 2014-11-11 07:23:58 -05:00
Connor Turland f1135854a0 fix for when mappings are corrupt 2014-11-11 07:23:44 -05:00
Connor Turland e30cedd733 grammar fix 2014-11-11 07:10:55 -05:00
Connor Turland 7e828aa973 Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw 2014-11-11 07:06:30 -05:00
Connor Turland 2c367978eb updated the last updated date 2014-11-11 07:06:15 -05:00
Connor Turland 70cf1426d7 fixed merges from develop 2014-11-11 07:05:31 -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