Commit Graph

319 Commits

Author SHA1 Message Date
Quincy Larson
7729f20729 update meta tags 2015-05-29 17:52:05 -07:00
Quincy Larson
a9d8992b88 fix if else syntax in Jade and add cities 2015-05-28 16:59:25 -07:00
Quincy Larson
673a617151 create pair, help, bug modals 2015-05-28 14:29:45 -07:00
terakilobyte
e7c855d72f Fully disable all help buttons for now, remove post to slack functionality for aventerous campers who enable the buttons through their console 2015-05-26 11:10:10 -04:00
terakilobyte
3078fa8104 Update chat link, fix 404 for ziplines and basejumps 2015-05-26 09:57:40 -04:00
terakilobyte
186d320d01 version updates to force browser fetch so buttons works 2015-05-26 09:14:10 -04:00
Quincy Larson
7279559c41 Merge branch 'staging' into nonprofit-improvements
Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade
2015-05-22 19:36:15 -07:00
Quincy Larson
b9adbd5976 add jobs page 2015-05-22 19:30:56 -07:00
Berkeley Martinez
4ad757ebd5 Merge pull request #466 from terakilobyte/challenge-restructure
Challenge restructure
2015-05-21 00:12:52 -07:00
terakilobyte
16ca72f716 Update views for new variable names. Get profile view working. Update challenge map. 2015-05-20 21:50:31 -04:00
LumenTeun
7b9faabd32 Github => GitHub 2015-05-20 16:29:05 +02:00
terakilobyte
a174a1c630 Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js 2015-05-19 22:31:01 -04:00
Quincy Larson
d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Quincy Larson
1033d74ccb hotfixes for field guide 2015-05-09 23:40:28 -07:00
Quincy Larson
b5747c7712 add facebook groups challenge, field guide and footer link 2015-05-09 10:52:02 -07:00
terakilobyte
adaa3cdece Remove template path, load correct javascript in universal header 2015-05-06 09:10:15 -04:00
terakilobyte
c170bef08c Hotfix fontawesome for site layout. Update package.json to lock to major version # 2015-05-04 17:37:29 -04:00
Quincy Larson
961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
Quincy Larson
14b99b7b67 finish making cdns gracefully fallback to bower 2015-05-03 16:31:45 -07:00
Quincy Larson
a0b7b0b653 heatmap looks better 2015-05-03 14:45:46 -07:00
Quincy Larson
8867fe42d7 get angular working in bower 2015-05-03 14:28:03 -07:00
Quincy Larson
c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Quincy Larson
d492afb4f5 Merge branch 'mobile-news'
Conflicts:
	views/challengeMap/show.jade
2015-05-01 21:54:10 -07:00
Quincy Larson
ec5c542d07 potentially fix the too many redirects issue 2015-05-01 21:32:24 -07:00
Quincy Larson
f17d8abf01 revert logo to free code camp logo 2015-05-01 00:05:32 -07:00
Quincy Larson
2cb02176a4 more camper news improvements 2015-04-30 15:56:14 -07:00
Quincy Larson
164411e2c4 fix spelling of pinterest 2015-04-30 08:53:48 -07:00
Quincy Larson
bea77c580e redirect user to bonfires if has completed waypoints but not bonfires gulp 2015-04-24 02:02:02 -07:00
Quincy Larson
e5e47136ea make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse 2015-04-24 01:31:59 -07:00
Quincy Larson
bf723b522b start making ux changes 2015-04-23 23:46:58 -07:00
Quincy Larson
34ac36a64a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-21 19:46:08 -07:00
Quincy Larson
3a54f3b5ad update the meta image files for our new curriculum 2015-04-21 19:38:13 -07:00
terakilobyte
e9c13124f1 Remove mention of ng-lodash from universal-head 2015-04-21 17:39:34 -04:00
terakilobyte
08bf658897 Harden camper news and don't expose user object. Upvoting still needs to be looked at. 2015-04-19 03:36:54 -04:00
Michael Q Larson
d078c6768a make the all field guides view conform to the challengeMap aesthetic 2015-04-18 17:19:06 -07:00
Michael Q Larson
d2fae63310 fix a few minor issues post merge 2015-04-16 23:16:55 -07:00
terakilobyte
dbc99eafb6 Update chat link and copy. 2015-04-17 01:41:01 -04:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
Michael Q Larson
ddb88643e0 Nathan's updates to the userMigration script' 2015-04-14 21:19:05 -07:00
Michael Q Larson
be00c7e402 Revert "remove inspectlet thinking this may be the malware twitter is finding"
This reverts commit 4b9be16b24.
2015-04-14 16:03:27 -07:00
Michael Q Larson
4b9be16b24 remove inspectlet thinking this may be the malware twitter is finding 2015-04-14 13:44:17 -07:00
Michael Q Larson
62cabd56ff update camper news and chat challenges to have new videos and updated copy 2015-04-09 12:58:30 -07:00
Michael Q Larson
9fb048183c finish up adding the slack functionality with a redirect on the chat navbar button 2015-04-08 22:52:14 -07:00
Michael Q Larson
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson
29b4e3b970 get seed data seeding and improve application submitted button 2015-04-08 14:57:08 -07:00
Michael Q Larson
1c7d0b11b6 pass the original story URL to all comments for notification email 2015-04-07 23:39:52 -07:00
Michael Q Larson
751d25219e improve the wiki seed file and add strikethrough to read wikis 2015-04-07 22:33:49 -07:00
Michael Q Larson
df4c698177 improve the challenge map 2015-04-07 12:45:31 -07:00
Michael Q Larson
2c6a781890 add inspectlet javascript 2015-04-07 00:32:01 -07:00
Michael Q Larson
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00