Commit graph

360 commits

Author SHA1 Message Date
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
Connor Turland c817622984 for heroku 2014-09-24 17:15:39 -04:00
Connor Turland 265295a8a8 added color generator for each collaborator 2014-09-24 17:14:46 -04:00
Shai Mor 4ec9c4cb98 add zoom and pas events for multiple peers and label direction for compassCollab 2014-09-24 16:25:22 -04:00
Connor Turland 74b4659836 broke out functionality for positionPeerIcon from updatePeerCoords 2014-09-24 14:05:18 -04:00
Shai Mor d5598819fd add arrowCompass for collab: direction indication of other users on the map 2014-09-24 11:00:22 -04:00
Connor Turland 58ff70717e heroku 2014-09-23 10:37:08 -04:00
Connor Turland dd6a21191a heroku 2014-09-22 23:56:47 -04:00
Connor Turland c2340301fd Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-22 23:42:37 -04:00
Connor Turland aaf2e4c521 right click styling 2014-09-22 23:42:26 -04:00
Shai Mor 1396b02952 collabCompass img&p for content and styling 2014-09-22 11:44:09 -04:00
Shai Mor d115861584 collabCompass img and p for content and styling 2014-09-22 11:36:53 -04:00
Connor Turland ff6eef7807 synapse form styling and positioning 2014-09-21 01:02:21 -04:00
Connor Turland 90e974164d added more resources into help lightbox 2014-09-20 15:11:58 -04:00
Connor Turland af5560b495 updates to metacode select within topic card 2014-09-18 02:33:38 -04:00
Connor Turland f62ca67d9f prevent self showing up on realtime problem 2014-09-15 22:04:44 -04:00
Connor Turland b6893d8f92 fixed admin panels 2014-09-15 21:57:34 -04:00
Connor Turland 6fe8cf4b88 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-12 15:07:52 -04:00
Shai Mor b722dc911b help qr tutorials 2014-09-12 11:45:53 -04:00
Connor Turland 4f8a8e2fde for heroku 2014-09-10 15:18:20 -04:00
Connor Turland 3d35d44c3f realtime improvement 2014-09-10 15:17:43 -04:00
Connor Turland ac8c589a77 config for heroku 2014-09-10 15:07:34 -04:00
Connor Turland 28bfb8ac21 better architecture for entering and exiting maps from the home page 2014-09-10 15:06:39 -04:00
Connor Turland 3a7501cc7a merge shai's changes 2014-09-09 18:20:17 -04:00
Connor Turland d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Shai Mor d18806bb18 merge in connors css 2014-09-09 15:17:49 -04:00