glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1015 commits 40 branches 27 tags 58 MiB
Commit graph

795 commits

Author SHA1 Message Date
Connor Turland 377138c483 fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions 2014-11-26 16:37:13 -05:00
Bashar Jabbour 363ca365c1 added tooltip to see topics synapses 2014-11-26 15:23:32 -05:00
Connor Turland ab53e996d4 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-26 14:49:16 -05:00
Connor Turland 36aeead2aa homepage updates. updated the 'last updated' text. fixed map cards 2014-11-26 14:49:01 -05:00
Bashar Jabbour 814a804dd8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-26 14:44:42 -05:00
Bashar Jabbour 085bf78b0e added tooltip for maps that topic appears in 2014-11-26 14:44:31 -05:00
Connor Turland a003e203af big home change revisions. not 100% complete 2014-11-26 12:58:20 -05:00
Connor Turland dbf4152a81 updated map delete sprite 2014-11-26 10:51:05 -05:00
Connor Turland d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06: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 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 7193d2a386 fixed small render node issue 2014-11-05 13:26:14 -05:00
Connor Turland b7ecf4ca8c added star to edges to indicate that there's multiple synapses there 2014-11-05 11:41:26 -05:00
Connor Turland 0b7702062f added little link icon next to metacode to indicate a link within a topic 2014-11-05 11:01:18 -05:00
Connor Turland 3b2e23b1e0 removed flicker from topic creation 2014-11-05 10:09:37 -05:00
Connor Turland 2bbe2b8eff improvements to realtime 2014-11-04 21:27:40 -05:00
Connor Turland c5907914e3 fixed user images, set up map updates for realtime 2014-11-04 12:37:17 -05:00
Connor Turland 28fb9a8bae little fix for profile picture uploading 2014-11-04 08:52:45 -05:00
Connor Turland 6a052f9ea1 added loading icon to account page while image uploads 2014-11-03 21:59:15 -05:00
Connor Turland 4646bf9668 client side image crop for profile pics 2014-11-03 21:26:08 -05:00
Connor Turland 6ecdd1076e topic card description overflow improvement, handle invalid links in topic card 2014-11-03 17:48:02 -05:00
Connor Turland ee1ca7853f removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner 2014-11-03 08:46:22 -05:00
Connor Turland 2a9a27c6c5 stops user from creating map with empty name, or topic with empty name. sets max length on topic name. allows enter key to create map 2014-11-02 16:04:53 -05:00
Connor Turland 3bebc62873 blocked empty topic creation with message to add title 2014-11-02 14:59:23 -05:00
Connor Turland 7805871ec2 made IE lightbox auto display when on IE 2014-11-02 14:32:42 -05:00
Connor Turland fed09404e6 fixed firefox add topic bug 2014-10-28 12:46:56 -04:00
Connor Turland 12e65c638b changes for reset password form 2014-10-27 18:24:30 -04:00
Connor Turland 33202b5243 checking cheatsheet content 2014-10-27 17:37:42 -04:00
Connor Turland 8b97c098f7 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-10-27 17:34:28 -04:00
Connor Turland c35174a99e removed extraneous typekit codes 2014-10-27 17:34:15 -04:00
poietic ad2a02bb8c removed extra div 2014-10-27 13:43:06 -04:00
poietic e898633d69 updated shortcuts + user actions. 2014-10-27 13:42:15 -04:00
Connor Turland acfd55a258 add authorize to delete to controller, fix private map message, fix new map css issue 2014-10-27 13:26:24 -04:00
Connor Turland f58db49bc1 realtime 2014-10-27 12:03:55 -04:00
Connor Turland cbf71ca2da four little styling bugs 2014-10-24 12:10:56 -04:00
Connor Turland 1aaecd0a8f improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug 2014-10-24 11:30:26 -04:00
Robert Best 852f62f85e Fixed single synapse selection 
Synapses were not being selected when simply clicked on.
 2014-10-23 17:01:34 -04:00
Connor Turland c6195956ca fixed topright sprite and fixed typekits for develop 2014-10-22 21:32:38 -04:00
Connor Turland 6af8a13c6f Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-10-22 21:09:08 -04:00
poietic 3a8e0c08a6 changed order of "delete, remove, hide from map" 2014-10-22 21:06:42 -04:00
Connor Turland fdfa720849 fixed ga code, and updated topright_sprite image with one that doesn't have littl glitches 2014-10-22 21:04:28 -04:00
poietic 875f37c480 changed order of "delete, remove, hide from map" 2014-10-22 20:48:01 -04:00
poietic 89b6305be8 updated bitcoin widget with correct wallet info 2014-10-22 17:07:41 -04:00
Connor Turland 49c0af3add Merge pull request #371 from Connoropolous/wip-MouseStuff 
Changes to Mouse Functionality
 2014-10-22 11:34:51 -04:00