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

889 commits

This branch
This branch
All branches
Author SHA1 Message Date
Connor Turland
75c286ecc6 merged develop fixes 2014-10-24 11:31:39 -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
Connor Turland
a8fb22ee95 fix for allowing sign ups, and for about lightbox overflow 2014-10-23 20:31:57 -04:00
Connor Turland
ed7844d195 fixed merge from develop 2014-10-23 20:19:40 -04:00
Connor Turland
2d0793c083 fixed broken lightbox content 2014-10-23 20:16:04 -04:00
Connor Turland
486ebb0d41 Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw 2014-10-23 19:54:48 -04:00
Connor Turland
189f04780c rejig urls, switch support image, add default map image 2014-10-23 19:54:39 -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
167f75a573 removed intro video reference 2014-10-23 13:00:48 -04:00
poietic
5c3b46ed0d "about" content and "colophon" content for TVW. 2014-10-23 12:59:41 -04:00
Connor Turland
c6195956ca fixed topright sprite and fixed typekits for develop 2014-10-22 21:32:38 -04:00
Connor Turland
e61a32ebaa removed typekit for mooo.com, fixed topright_sprite 2014-10-22 21:26:37 -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
dfabb35daa Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw 2014-10-22 19:55:09 -04:00
Connor Turland
c0751b8121 added metamap image 2014-10-22 19:54:47 -04:00
poietic
89b6305be8 updated bitcoin widget with correct wallet info 2014-10-22 17:07:41 -04:00
poietic
74e5f7072e added metamap metacode 2014-10-22 16:04:24 -04:00
Connor Turland
929bd65576 Update metacodes.yml 2014-10-22 14:06:51 -04:00
Connor Turland
f680aa0f9e Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw 2014-10-22 13:41:33 -04:00
Connor Turland
3d973dc7f3 styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images 2014-10-22 13:41:06 -04:00
poietic
2b87e8731b changed to TVW metacodes + hex codes + urls 2014-10-22 13:05:39 -04:00
Connor Turland
13937ae51d merged conflicts coming from develop branch 2014-10-22 11:52:31 -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
Connor Turland
d6740385ac Merge branch 'develop' into tvw 2014-10-20 13:48:03 -04:00
Connor Turland
369779387d removed phantomjssetup doc 2014-10-20 13:47:30 -04:00
Connor Turland
968da71860 removed phantomjssetup doc 2014-10-20 13:44:59 -04:00
Connor Turland
c03960025e Update UbuntuInstallation.md 2014-10-20 13:40:31 -04:00
Connor Turland
86e16d0a9c Update UbuntuInstallation.md 2014-10-20 13:39:33 -04:00
Connor Turland
46c9e47b7f Update UbuntuInstallation.md 2014-10-20 13:33:07 -04:00
Connor Turland
22ef16fb9a switched out old metacode images, switched in TVW images 2014-10-20 12:56:13 -04:00
Connor Turland
551c46e24e Merge branch 'thevalueweb' of https://github.com/Connoropolous/metamaps_gen002 into tvw 2014-10-20 12:33:16 -04:00
Connor Turland
f0d8f2766b remove request invite from the sign up form 2014-10-18 20:32:19 -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
2db27ff15b fixed homepage redirect loop? 2014-10-18 19:43:54 -04:00
Connor Turland
37455abfe9 removed lightboxes, password protected 2014-10-18 19:26:34 -04:00
Raymon Johnstone
6840d69747 lightboxes and stylesheet changes 2014-10-18 13:56:45 -04:00
Connor Turland
b4f4aefed0 switch ruby version 2014-10-18 13:02:31 -04:00
Connor Turland
25980b6c38 switched ruby version 2014-10-18 13:01:15 -04:00
Connor Turland
1f7df00d3c setup google analytics and production urls 2014-10-18 12:46:45 -04:00
Connor Turland
a96a0852db Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-18 11:34:18 -04:00
Connor Turland
73b767df80 corrected realtime package file 2014-10-18 11:33:48 -04:00
Connor Turland
a56532af0f Update WindowsInstallation.md 2014-10-18 09:29:00 -04:00
Connor Turland
764c1f5ff4 removed node_modules from git 2014-10-18 09:22:17 -04:00
Connor Turland
7dc2f66d96 Update .gitignore 2014-10-18 09:15:08 -04:00