Commit graph

385 commits

Author SHA1 Message Date
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
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
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 f9f147304f styling for map info box mostly complete 2014-10-14 16:34:09 -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 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
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 b5068b6bc4 finalized uservoice config 2014-10-07 15:19:10 -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 9169293323 small fix for minimizing search results 2014-10-01 20:00:03 -04:00
Connor Turland b6700f77f8 synapse fixes 2014-10-01 19:52:08 -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 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 06f18215dd bug fixes for mapping experience. able to store multiple references to synapses on each edge 2014-09-29 16:04:36 -04:00
Robert Best 2de7167c2c A bunch of fixes for selection with box, and zoom to extents 2014-09-28 15:29:22 -04:00
Robert Best 66ee35e364 Fixed merge conflicts with wip-zoomextents code 2014-09-26 23:34:27 -04:00
Robert Best 0160f56238 partially finished fixes to zoomextents 2014-09-26 22:40:31 -04:00
Connor Turland 32908c7717 style changes for account pages 2014-09-26 22:31:06 -04:00
BasharJabbour 14eb7562b1 fixed edit user account page 2014-09-26 08:42:11 -04:00