Commit graph

907 commits

Author SHA1 Message Date
Connor Turland
9bef7ab668 Merge branch 'develop' into tvw 2014-10-28 12:47:40 -04:00
Connor Turland
fed09404e6 fixed firefox add topic bug 2014-10-28 12:46:56 -04:00
Connor Turland
ac951e52fb changed email config for tvw 2014-10-27 18:32:41 -04:00
Connor Turland
54584fb064 Merge branch 'develop' into tvw 2014-10-27 18:24:50 -04:00
Connor Turland
12e65c638b changes for reset password form 2014-10-27 18:24:30 -04:00
Connor Turland
21ebc41a02 merge develop typekit changes 2014-10-27 17:47:57 -04:00
Connor Turland
662f11f689 add forgot password form url to accessible signed out urls 2014-10-27 17:46:17 -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
96ed2bcd64 Merge branch 'develop' into tvw 2014-10-27 13:26:42 -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
07b74ccc31 merge develop and switch default metacode set 2014-10-27 12:15:57 -04:00
Connor Turland
f58db49bc1 realtime 2014-10-27 12:03:55 -04:00
Connor Turland
8e55d32146 Merge branch 'develop' into tvw 2014-10-24 12:11:24 -04:00
Connor Turland
cbf71ca2da four little styling bugs 2014-10-24 12:10:56 -04:00
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