Commit graph

875 commits

Author SHA1 Message Date
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
Connor Turland
369779387d removed phantomjssetup doc 2014-10-20 13:47:30 -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
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
b4f4aefed0 switch ruby version 2014-10-18 13:02:31 -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
Connor Turland
52e3162a37 Update WindowsInstallation.md 2014-10-18 08:52:36 -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