Connor Turland
|
e30cedd733
|
grammar fix
|
2014-11-11 07:10:55 -05:00 |
|
|
Connor Turland
|
7e828aa973
|
Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw
|
2014-11-11 07:06:30 -05:00 |
|
|
Connor Turland
|
2c367978eb
|
updated the last updated date
|
2014-11-11 07:06:15 -05:00 |
|
|
Connor Turland
|
70cf1426d7
|
fixed merges from develop
|
2014-11-11 07:05:31 -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
|
44923eb660
|
added new map screenshot capture method
|
2014-11-09 22:10:13 -05:00 |
|
|
Connor Turland
|
d73fa37f57
|
tweaked donate and get involved html
|
2014-11-08 15:00:12 -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
|
c5907914e3
|
fixed user images, set up map updates for realtime
|
2014-11-04 12:37:17 -05:00 |
|
|
Connor Turland
|
6a052f9ea1
|
added loading icon to account page while image uploads
|
2014-11-03 21:59:15 -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
|
7805871ec2
|
made IE lightbox auto display when on IE
|
2014-11-02 14:32:42 -05:00 |
|
|
poietic
|
ebf90e3da5
|
updated commons map tip.
|
2014-10-29 12:26:55 -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
|
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
|
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
|
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 |
|
|
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
|
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
|
89b6305be8
|
updated bitcoin widget with correct wallet info
|
2014-10-22 17:07:41 -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 |
|
|
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 |
|
|
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
|
f0d8f2766b
|
remove request invite from the sign up form
|
2014-10-18 20:32:19 -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
|
1f7df00d3c
|
setup google analytics and production urls
|
2014-10-18 12:46: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 |
|