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

758 commits

Author SHA1 Message Date
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
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
7e182b8beb figured out phantom? 2014-10-08 03:24:08 -04:00
Connor Turland
c90721ad5c nothing 2014-10-08 02:34:17 -04:00
Connor Turland
51cb54a6e0 no change" 2014-10-08 02:21:32 -04:00
Connor Turland
841e6fb3ab update phantom settings 2014-10-08 00:47:17 -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
cf01e711dd merge with devin 2014-10-07 19:19:24 -04:00
Connor Turland
db3a4b66ad fixed issue that others might end up having with sso_key 2014-10-07 19:14:25 -04:00
Devin Howard
c6c05085ad Added phantomjs script to save an image - this doesn't totally work yet, it has a error with famous 
Added worker process to call the phantomjs script in app/workers
Added hook in models/map.rb to call the worker
Added calls to map.touch in mappings_controller.rb so it would get triggered correctly - I'm not sure how this will proceed moving forward
 2014-10-07 19:11:55 -04:00
Connor Turland
a8d173ff1d made http protocol for uservoice redirect consistent 2014-10-07 18:49:14 -04:00