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

377 commits

Author SHA1 Message Date
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
Connor Turland 1cceaceb06 cannow handle multiple metacodes with same names 2014-10-16 21:03:11 -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 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 fcdc6d57b2 setup for automatic config for urls 2014-10-10 21:24:31 -04:00
Connor Turland cde771e007 got map screenshot working decent 2014-10-08 00:07:54 -04:00
Connor Turland db3a4b66ad fixed issue that others might end up having with sso_key 2014-10-07 19:14:25 -04:00
Connor Turland d4c481aac0 internet explorer get browser links open in new tabs 2014-10-07 17:57:12 -04:00
Connor Turland e756b29baa Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 17:46:34 -04:00
Connor Turland 629a6a4172 fixed sign in redirects 2014-10-07 17:46:09 -04:00
Bashar Jabbour c8bda1bdf1 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 16:14:14 -04:00
Bashar Jabbour 8a70d209d1 fixed the links in noIE lightbox 2014-10-07 16:14:00 -04:00
Connor Turland 9ba6daec90 further fixed uservoice to identify user 2014-10-07 15:39:11 -04:00