|
|
322fce8c3e
|
Merge remote-tracking branch 'upstream/staging' into staging
|
2015-05-01 07:52:50 -04:00 |
|
|
|
6c9a039a01
|
Merge pull request #403 from QuincyLarson/master
Unsubscribe mechanism for email campaigns
|
2015-05-01 00:10:05 -07:00 |
|
|
|
d8b5028619
|
update announcement modal
|
2015-05-01 00:07:34 -07:00 |
|
|
|
f17d8abf01
|
revert logo to free code camp logo
|
2015-05-01 00:05:32 -07:00 |
|
|
|
1ec3ef7433
|
remove errant console.log
|
2015-04-30 23:42:46 -07:00 |
|
|
|
19456f2e23
|
add unsubscribe path
|
2015-04-30 23:41:40 -07:00 |
|
|
|
fb3a116fff
|
Merge branch 'master' into mobile-news
Conflicts:
controllers/story.js
seed_data/field-guides.json
views/coursewares/showVideo.jade
|
2015-04-30 19:10:10 -07:00 |
|
|
|
d6da385b92
|
remove some whitespace
|
2015-04-30 19:03:55 -07:00 |
|
|
|
fefd7e19f5
|
update the sitemap to new news path
|
2015-04-30 17:22:14 -07:00 |
|
|
|
222f9b9a64
|
fix some of the news functionality
|
2015-04-30 17:18:08 -07:00 |
|
|
|
2cb02176a4
|
more camper news improvements
|
2015-04-30 15:56:14 -07:00 |
|
|
|
7b61e9daa2
|
More view beautification for mobile.
|
2015-04-30 15:19:38 -07:00 |
|
|
|
cc13b325d6
|
fix some issues with @terakilobyte and beautify the camper news index view
|
2015-04-30 14:55:00 -07:00 |
|
|
|
58981252cc
|
Merge pull request #393 from Munsterberg/munsterberg-391
Fixed typo on nonprofit detail page
|
2015-04-30 16:13:40 -04:00 |
|
|
|
164411e2c4
|
fix spelling of pinterest
|
2015-04-30 08:53:48 -07:00 |
|
|
|
15efe19971
|
Merge pull request #395 from QuincyLarson/staging
update coursewares with videos
|
2015-04-29 22:35:46 -07:00 |
|
|
|
c856658360
|
update coursewares with videos
|
2015-04-29 22:35:04 -07:00 |
|
|
|
026f210b6e
|
fix the button hotkeys in the showZiplineOrBasejump view
|
2015-04-29 22:32:52 -07:00 |
|
|
|
0c1ba64a83
|
fix copy around git commits on basejumps
|
2015-04-29 22:13:03 -07:00 |
|
|
|
19a556af80
|
add videos to some challenges
|
2015-04-29 22:05:21 -07:00 |
|
|
|
55afd8518c
|
Add missing semi-colon
|
2015-04-29 20:55:47 -04:00 |
|
|
|
e77eae2643
|
Edited per instructions in codepen to let users specify additional screen names
|
2015-04-29 20:07:38 -04:00 |
|
|
|
1e21d5d7aa
|
Fix some linting errors in app.js and highlight questionable code with todo comments
|
2015-04-29 19:30:51 -04:00 |
|
|
|
a201633e09
|
improvements and fixes for our field guide. Add 20 day announcement modal
|
2015-04-29 15:31:49 -07:00 |
|
|
|
22f8cc2b65
|
improvements to field guide
|
2015-04-29 12:30:53 -07:00 |
|
|
|
a1de124c61
|
Fixed typo on nonprofit detail page
|
2015-04-29 13:17:33 -04:00 |
|
|
|
c71514cc81
|
Merge pull request #390 from alex-dixon/fieldguide-hotfix
Revert Mac keyboard shortcuts in field guide
|
2015-04-29 10:46:14 -04:00 |
|
|
|
ddb93897bc
|
Revert Mac keyboard shortcuts
|
2015-04-29 07:16:17 -07:00 |
|
|
|
ffa2404993
|
Added API endpoint for twitter calls to use in codepen. NOTE added tokens to env file
|
2015-04-29 08:00:57 -04:00 |
|
|
|
81ccadc106
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
|
2015-04-29 07:39:12 -04:00 |
|
|
|
7e7cdab867
|
field guide fixes for @zersiax
|
2015-04-28 22:54:55 -07:00 |
|
|
|
589059aa05
|
start styling news for mobile
|
2015-04-28 22:29:59 -07:00 |
|
|
|
9e8a618491
|
Twitter fixes.
|
2015-04-28 20:40:02 -04:00 |
|
|
|
2487f0421b
|
Fix tweeting in challenges
|
2015-04-28 19:35:12 -04:00 |
|
|
|
38525eb77a
|
make some minor improvements to the courseware.json file
|
2015-04-28 16:17:09 -07:00 |
|
|
|
0f4c13c234
|
improvements to basejump and zipline copy
|
2015-04-28 13:25:38 -07:00 |
|
|
|
35515c2da5
|
Merge branch 'videos' into pmi
|
2015-04-28 12:12:20 -07:00 |
|
|
|
0bbc803955
|
replace landing youtube videos with superior vimeo video
|
2015-04-28 12:11:49 -07:00 |
|
|
|
a8e215c74e
|
Check everything for undefined in email reply logic for story.js
|
2015-04-27 20:03:37 -04:00 |
|
|
|
11c887c55f
|
Merge branch 'QuincyLarson-pmi' into staging
|
2015-04-27 19:40:07 -04:00 |
|
|
|
cef70a67a9
|
Fix broken url
|
2015-04-27 19:39:58 -04:00 |
|
|
|
fd456ec9be
|
make new landing pages and forms for project managers and nonprofits
|
2015-04-27 16:17:29 -07:00 |
|
|
|
327530a642
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
|
2015-04-27 13:26:57 -04:00 |
|
|
|
5a6e2cc4bd
|
minor copy edits and improvements to seed files
|
2015-04-27 00:33:14 -07:00 |
|
|
|
45490f75c4
|
make checkboxes larger and remove text clicking for completion
|
2015-04-27 00:10:14 -07:00 |
|
|
|
5be9dd2587
|
gracefully handle original story poster having been deleted in mailer
|
2015-04-26 23:19:03 -07:00 |
|
|
|
dac45382e2
|
Merge branch 'master' into videos
Conflicts:
app.js
|
2015-04-26 22:52:06 -07:00 |
|
|
|
c50ce70749
|
minor updates to coursewares and field guides
|
2015-04-26 12:46:48 -07:00 |
|
|
|
03c407c3ce
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-04-25 19:00:30 -07:00 |
|
|
|
4dab70d5a6
|
Merge branch 'Maximization-maximization-352' into t push origin stagingstaging
|
2015-04-25 18:59:57 -07:00 |
|
