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

660 commits

Author SHA1 Message Date
Connor Turland 0e3393e1b5 fixed metacode select lists to be flexible to metacodes 2014-11-27 18:10:17 -05:00
Connor Turland caa80c067b links to maps go through without refresh from topic card. 2014-11-27 17:27:22 -05:00
poietic 6408f81d08 updated feedback & partner logo images 2014-11-27 12:10:38 -08:00
Bashar Jabbour a284889593 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-27 15:02:58 -05:00
Bashar Jabbour 78743fbba5 updated the tooltip of maps topic appears in 2014-11-27 15:02:44 -05:00
poietic 47b5e9c288 fixed search alignment & drop shadow 2014-11-27 11:56:45 -08:00
Connor Turland 7cc6fb6c2d added right click keyboard shortcuts and spacer/border 2014-11-27 11:21:25 -05:00
Connor Turland f6fdd72cf8 fixed sign in form to use correct size for anonymous user image 2014-11-26 16:49:56 -05:00
Connor Turland 2829005d4e Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-26 16:37:50 -05:00
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 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
Bashar Jabbour 0d709cecac updated the map contributors tooltip to match pseudo css 2014-11-18 23:24:43 -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 fe5d682fc2 finished synapse autocomplete styling 2014-11-16 15:17:32 -05:00
Connor Turland 23d5527adc lots of little fixes 2014-11-15 17:43: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 8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -05:00
Connor Turland 9b0304c403 added filtering back to topic view 2014-11-11 02:23:39 -05: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 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 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 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
Connor Turland 49c0af3add Merge pull request #371 from Connoropolous/wip-MouseStuff 
Changes to Mouse Functionality
 2014-10-22 11:34:51 -04:00
Robert Best 7e6092070a Update JIT.js 
Commented out the console logs for now.
 2014-10-22 09:41:21 -04:00
Robert Best ba2888420e Update Metamaps.JIT.js 
Commented out the console logs for now.
 2014-10-22 09:39:14 -04:00
Connor Turland a7328526a8 got profile picture uploading working, as well as profile picture removing, as well as password changing 2014-10-21 20:31:59 -04:00
Raymon Johnstone 4db8dd90a2 Changed a bunch of mouse functionality mappings. LeftDrag+CTRL+SHIFT to zoom to box (Or rightDrag + CTRL). The rest of left dragging is for selection 2014-10-18 20:28:16 -04:00
Raymon Johnstone 6840d69747 lightboxes and stylesheet changes 2014-10-18 13:56:45 -04:00
Connor Turland fbfe695998 adding topics to map from search results happens in a spiral 2014-10-16 23:54:26 -04:00
Connor Turland 1cceaceb06 cannow handle multiple metacodes with same names 2014-10-16 21:03:11 -04:00
Connor Turland 0449e28177 right click menus position nicely 2014-10-15 19:32:15 -04:00
Connor Turland 79daaf705b made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen 2014-10-15 18:25:31 -04:00
Connor Turland e43b7fca87 one small fix for hiding 'share map' on map info box viewing a private map 2014-10-14 23:58:05 -04:00
Connor Turland d9c01db056 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 23:45:39 -04:00
Raymon Johnstone bbbbe57c1b new library 2014-10-14 23:43:25 -04:00
Connor Turland 86bd12ca09 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 23:20:46 -04:00
Connor Turland c37c846fbd ensured map info box action buttons only show at proper times. enabled deletion of maps 2014-10-14 23:20:40 -04:00
Raymon Johnstone a9414c29d2 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-14 23:20:20 -04:00
Raymon Johnstone 3c7db77395 backing up bitcoin 2014-10-14 23:19:58 -04:00
Connor Turland bfc8c796c7 border radius for map card images 2014-10-14 17:00:17 -04:00
Connor Turland 0ebb02bc0b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 16:34:26 -04:00
Connor Turland f9f147304f styling for map info box mostly complete 2014-10-14 16:34:09 -04:00
Raymon Johnstone 0e5e814065 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-13 23:21:53 -04:00
Raymon Johnstone b1ae75a896 updates to all walkthroughs about the fact that we now use rails 2.1.2 as well as a couple changes to the get involved lightbox 2014-10-13 23:18:25 -04:00
Connor Turland 51221ee3f7 improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards 2014-10-13 19:27:30 -04:00
Connor Turland e17cfb4f12 border radius for map created prompt 2014-10-11 23:08:31 -04:00
Connor Turland cd4474a0f0 created map prompt 2014-10-11 22:49:44 -04:00
Connor Turland fcdc6d57b2 setup for automatic config for urls 2014-10-10 21:24:31 -04:00
Connor Turland cde771e007 got map screenshot working decent 2014-10-08 00:07:54 -04:00
Connor Turland 4f94f44a1f Merge branch 'wip-phantomjs' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-07 21:30:42 -04:00
Connor Turland 84d926149c removed barometer.js 2014-10-07 21:30:25 -04:00
Devin Howard 68e1a8042a Added animationDone event to Metamaps.JIT.js, tried to hook into it from phantomjs, failed 
still have debugging stuff in this commit. it's currently rendering the image so I can check output

It doesn't seem to be responding to the event, and it's stopped hiding the UI elements around the edge
 2014-10-07 20:25:45 -04:00
Connor Turland 9ba6daec90 further fixed uservoice to identify user 2014-10-07 15:39:11 -04:00
Connor Turland 6eec187eee Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 15:19:30 -04:00
Connor Turland b5068b6bc4 finalized uservoice config 2014-10-07 15:19:10 -04:00
Bashar Jabbour e3c677fa5b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 14:47:18 -04:00
Bashar Jabbour e405cc5a5d updated the noIE lightbox 2014-10-07 14:47:06 -04:00
Raymon Johnstone fbdef0108e Merge commit 'stash' into develop 2014-10-07 12:39:43 -04:00
Raymon Johnstone 3cb5c4ce3a index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar 2014-10-07 12:39:14 -04:00
Connor Turland f591baf4c9 ability to switch between multiple synapses between two topics 2014-10-05 18:39:07 -04:00
Connor Turland ecc2ee9fea fixes #347. changes ctrl-r for remove from map to ctrl-m 2014-10-05 14:27:16 -04:00
Connor Turland 5c05c6bb83 404 page updates, synapse card 90% 2014-10-05 13:58:05 -04:00
Connor Turland ad2d79a7ea Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-05 09:44:28 -04:00
Robert Best ef39443eb0 Relocated keyboard shortcut code to Metamaps.Listeners.... Then added CTRL+ R , +H, and +D shortcuts for remove, hide and delete 2014-10-05 01:03:54 -04:00
Connor Turland 509e9dd6f0 heroku 2014-10-04 00:17:00 -04:00
Connor Turland d30417f958 fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar 2014-10-04 00:15:47 -04:00
Connor Turland fae7f9996d Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-03 11:26:49 -04:00
Bashar Jabbour cad8af2c1f updated the cheatsheet 2014-10-02 22:33:28 -04:00
Bashar Jabbour 6785a61fd0 updated 404 page 2014-10-02 15:55:51 -04:00
Connor Turland 10e5228488 finalized cheatsheet move help button back into the corner 2014-10-01 23:41:39 -04:00
Bashar Jabbour b70681ea6e updated the 404 page 2014-10-01 23:21:05 -04:00
Bashar Jabbour 179cee8456 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-01 20:43:23 -04:00
Bashar Jabbour 8caabb6ce1 update the colophone page 2014-10-01 20:43:11 -04:00
Connor Turland 9169293323 small fix for minimizing search results 2014-10-01 20:00:03 -04:00
Connor Turland eb57e555e9 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-01 19:52:14 -04:00
Connor Turland b6700f77f8 synapse fixes 2014-10-01 19:52:08 -04:00
Shai Mor ff4a64665e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-01 18:09:15 -04:00
Shai Mor 4ba9a26c2b style sidebar search mapper stats 2014-10-01 18:07:05 -04:00
Connor Turland a1925b3573 heroku 2014-10-01 17:20:02 -04:00
Connor Turland b577f4fd19 improved z-indexes 2014-10-01 17:15:35 -04:00
Connor Turland 999dae34ea switched add link section on topic card to be without upload file for now 2014-10-01 16:44:11 -04:00
Connor Turland 8ef56735bf switch metacode set styling complete 2014-10-01 16:23:59 -04:00
Connor Turland a382e0c35d account page image border radius, fixed filters not working on first click issue 2014-10-01 14:07:48 -04:00
Connor Turland 031f97ba42 search results styling 2014-10-01 13:18:24 -04:00
Shai Mor db719abf0f merge with develop 2014-10-01 09:57:40 -04:00
Shai Mor 57fb6a15c4 start on search results styling, pulled in external js libraries and css 2014-10-01 09:54:56 -04:00
Connor Turland eccc433627 fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something 2014-09-30 18:13:49 -04:00
Connor Turland 81f31ea10e heroku 2014-09-30 16:59:19 -04:00
Connor Turland 86e78919b3 initial code for realtime, got new topic, new synapse, and topic drag working 2014-09-30 16:55:25 -04:00
Connor Turland c1885615cd remove tilda file 2014-09-29 22:26:50 -04:00
Connor Turland 2138aa89f3 closes #368. ability to add in metacode colors 2014-09-29 22:26:12 -04:00