Commit graph

531 commits

Author SHA1 Message Date
Devin Howard
85b3012cd9 fix a few more mappable/topic/synapse things in JS 2015-10-02 18:54:17 +08:00
Devin Howard
6d1e382d5c change from category/topic_id/synapse_id to mappable_type/mappable_id 2015-10-02 16:32:16 +08:00
Devin Howard
120edfc278 fix typo + debug statements to make existingSynapse autocomplete work 2015-10-02 15:46:48 +08:00
Devin Howard
80b2b1876a deal with https://github.com/twitter/typeahead.js/issues/1195 2015-10-02 14:39:17 +08:00
Devin Howard
a51777b0ba working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-10-02 13:36:51 +08:00
Devin Howard
14eeb0cbe6 upgrade typeahead to 1.10 and new syntax 2015-10-01 14:55:26 +08:00
Devin Howard
b3b065e623 Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
2015-10-01 11:34:19 +08:00
Devin Howard
347d77df82 upgrade typeahead to allow new syntax 2015-10-01 11:14:25 +08:00
Devin Howard
b0efe6aea8 Merge branch 'develop' into rails4 2015-10-01 11:05:27 +08:00
Devin Howard
a9b034637b only autocomplete topic/synapse if the user types more than 2 characters 2015-09-30 13:55:23 +08:00
Devin Howard
a31a92b321 Merge branch 'develop' into rails4 2015-09-15 20:37:47 +08:00
Devin Howard
d67d098b2a remove old jquery-ui file 2015-09-10 22:40:45 +08:00
Connor Turland
5cd4db66c6 needed to update embedly 2015-08-03 14:02:30 -04:00
Connor Turland
499f6349e6 add ability for admin to delete any topics and synapses 2015-04-28 18:43:47 -04:00
Connor Turland
9ed0d412df .width() returned wrong result in firefox, causing the map to load with off dimensions 2015-02-01 11:50:22 -05:00
Connor Turland
531f09c6d3 active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time 2015-01-31 12:39:48 -05:00
Connor Turland
4d7695a767 this will clear up any remaining issues with urls ending up wrong 2015-01-30 21:08:37 -05:00
Connor Turland
4ca12c70ab explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow 2015-01-30 20:49:30 -05:00
Connor Turland
5cf75f3ea2 prevented map from loading before all metacode images were loaded 2015-01-30 00:09:45 -05:00
Connor Turland
670dd5d874 added user feedback, and moved the edge actually hiding into the if statement where it should be 2015-01-29 22:23:24 -05:00
Connor Turland
a048c87356 mapper who doesn't own a topic or synapse should not be able to delete it. 2015-01-28 22:35:03 -05:00
Connor Turland
5a31c91597 Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling 2015-01-28 21:39:33 -05:00
Connor Turland
5d9305fb11 adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded 2015-01-28 21:38:44 -05:00
Connor Turland
dbfc0e4f4d Merge pull request #380 from metamaps/bug-labelsDisappearing
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
2015-01-28 21:35:20 -05:00
Connor Turland
d2e9d87037 when a topic was deleted, renderEdgeArrows was trying to call on a topic that was no longer existent to draw synapse direction, breaking the graph render 2015-01-28 21:04:00 -05:00
Connor Turland
bb99583622 updated embedly library, and data-card-chrome was now causing a breaking change 2015-01-28 19:19:07 -05:00
Connor Turland
0f526d1696 Merge pull request #376 from metamaps/bug-removeNodes
maps were crashing when topics were removed
2015-01-22 21:52:06 -05:00
Connor Turland
595ff893f3 removed console logs 2015-01-22 21:42:21 -05:00
Connor Turland
263eef52ce maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events 2015-01-11 13:30:05 -05:00
Connor Turland
eece1446f2 added tutorial 2014-12-02 13:32:36 -05:00
Bashar Jabbour
b883d03b4e make synapse card mapper icon link to mapper profile 2014-11-29 16:36:57 -05:00
Connor Turland
411efa9692 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 16:06:04 -05:00
Connor Turland
694d36b6a6 ctrl+click doesn't zoom awkwardly 2014-11-29 16:05:56 -05:00
Bashar Jabbour
10dedaa169 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-29 15:57:42 -05:00
Bashar Jabbour
ce3ab9903a make map contributor list dropdown into links to profiles 2014-11-29 15:56:38 -05:00
Devin Howard
8b146fccab Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 2014-11-29 15:53:53 -05:00
Devin Howard
739eba71bb only one router setTimeout function at a time - make it erase old functions if new one 2014-11-29 15:51:31 -05:00
Connor Turland
93227f0e2f fixed synapse selection and removal of multiple topics bugs 2014-11-29 15:36:03 -05:00
Devin Howard
fe3d280862 remove console.log from Connor 2014-11-29 15:29:16 -05:00
Devin Howard
5f347bff67 remove console.logs whoops 2014-11-29 15:24:34 -05:00
Devin Howard
453758a9ff use lambda to store currentPage so explore/mine doesn't get rendered incorrectly in url as explore/<mapid> 2014-11-29 15:23:53 -05:00
Connor Turland
09d8fbacb6 disabled tutorials tab for now 2014-11-29 10:51:27 -05:00
Connor Turland
61c6c8c5c1 added empty canvas helper message 2014-11-29 10:18:18 -05:00
Connor Turland
cb3db06406 switched home page to active maps instead of my maps 2014-11-29 01:37:06 -05:00
Connor Turland
da6a7aadfb fixed synapse creation. replaced homepage bg image 2014-11-27 21:32:04 -05:00
Connor Turland
caa80c067b links to maps go through without refresh from topic card. 2014-11-27 17:27:22 -05: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
Connor Turland
7cc6fb6c2d added right click keyboard shortcuts and spacer/border 2014-11-27 11:21:25 -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
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
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
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
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
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
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
44923eb660 added new map screenshot capture method 2014-11-09 22:10:13 -05: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
f58db49bc1 realtime 2014-10-27 12:03:55 -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
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
Connor Turland
fbfe695998 adding topics to map from search results happens in a spiral 2014-10-16 23:54:26 -04:00