Compare commits

...

52 commits

Author SHA1 Message Date
leap e1d4dafa5e Merge branch 'instance/synbioleap' of https://github.com/metamaps/metamaps_gen002 into instance/synbioleap 2015-10-02 01:47:21 -04:00
Devin Howard 7350b9bb9a add to metacode_sets fixtures 2015-10-02 13:43:50 +08:00
poietic 73b3c499cf added metacodes 2015-06-13 23:29:46 -07:00
poietic 5c2129e219 LEAP branding, content & aesthetic tweaks 2015-06-09 12:38:27 -07:00
Devin Howard 44e8b8d581 Merge branch 'master' into thevalueweb 2015-06-03 18:14:05 -04:00
Connor Turland 96cee3cf21 Merge branch 'master' into thevalueweb 2015-02-06 17:44:10 -05:00
Connor Turland d069cecc9b fixed unfound merge conflict 2014-12-03 09:00:05 -05:00
Connor Turland a83c3e4b85 removed any more references to mapper generation 2014-12-03 08:48:58 -05:00
Connor Turland f094fd29f7 cleaned up unwanted stuff from metamapscc for tvw 2014-12-03 08:39:12 -05:00
Connor Turland 1b5ac1dafa merged develop into thevalueweb 2014-12-03 08:26:11 -05:00
Connor Turland 54bb3d2c3d updated the 404 page. fixed merge conflicts. removed generation code 2014-11-23 22:58:30 -05:00
Connor Turland 38c3ba419c Merge branch 'develop' into tvw 2014-11-11 07:51:22 -05:00
Connor Turland d673172abf Merge branch 'develop' into tvw 2014-11-11 07:23:58 -05:00
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
poietic ebf90e3da5 updated commons map tip. 2014-10-29 12:26:55 -04:00
Connor Turland 9bef7ab668 Merge branch 'develop' into tvw 2014-10-28 12:47:40 -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 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 96ed2bcd64 Merge branch 'develop' into tvw 2014-10-27 13:26:42 -04:00
Connor Turland 07b74ccc31 merge develop and switch default metacode set 2014-10-27 12:15:57 -04:00
Connor Turland 8e55d32146 Merge branch 'develop' into tvw 2014-10-24 12:11:24 -04:00
Connor Turland 75c286ecc6 merged develop fixes 2014-10-24 11:31:39 -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
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 e61a32ebaa removed typekit for mooo.com, fixed topright_sprite 2014-10-22 21:26:37 -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 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 d6740385ac Merge branch 'develop' into tvw 2014-10-20 13:48:03 -04:00
Connor Turland 968da71860 removed phantomjssetup doc 2014-10-20 13:44:59 -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
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
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
216 changed files with 395 additions and 573 deletions

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Some files were not shown because too many files have changed in this diff Show more