terakilobyte
|
b49d2fd343
|
Resolve merge conflicts using Webstorm's merge integration tool.
|
2015-04-17 00:11:13 -04:00 |
|
terakilobyte
|
56e45ba9dd
|
resolve merge conflict
|
2015-04-15 18:35:06 -04:00 |
|
terakilobyte
|
8119858a24
|
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
|
2015-04-15 18:20:40 -04:00 |
|
terakilobyte
|
6341b1158b
|
add eslint task to gulp to let us know how we need to write better code
|
2015-04-15 18:20:20 -04:00 |
Quincy Larson
|
d20aa1cf3c
|
Merge pull request #288 from FreeCodeCamp/resources
Create Wiki controller to replace our static pages
|
2015-04-15 01:03:19 -07:00 |
|
Michael Q Larson
|
d968524c69
|
attempt to fix wording on seek and destroy bonfire issue #293
|
2015-04-15 00:59:12 -07:00 |
|
Michael Q Larson
|
993db11189
|
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
|
2015-04-15 00:12:27 -07:00 |
|
Michael Q Larson
|
22be5b90ba
|
more improvements to the basejump challenges
|
2015-04-15 00:12:16 -07:00 |
|
Quincy Larson
|
27f80eddea
|
Update README.md with better contribution directions. Point to AirBnB styleguide. (closes #307)
|
2015-04-15 00:07:14 -07:00 |
|
Quincy Larson
|
255a6b48be
|
Merge pull request #298 from aldraco/coursewaresErr
Issue #277 Fix- coursewares chai-jquery test issue
|
2015-04-14 23:43:38 -07:00 |
|
terakilobyte
|
3748356079
|
Update user migration script to ensure user model validity.
|
2015-04-15 00:53:36 -04:00 |
|
Michael Q Larson
|
ddb88643e0
|
Nathan's updates to the userMigration script'
|
2015-04-14 21:19:05 -07:00 |
|
Michael Q Larson
|
e033f224bc
|
fix challenge map to redirect to nonprofits
|
2015-04-14 20:20:38 -07:00 |
|
Michael Q Larson
|
e0aa084c7a
|
finish getting field-guide working and improve zipline show view
|
2015-04-14 20:12:47 -07:00 |
|
terakilobyte
|
9c67d4988f
|
Add new currying challenge to bonfires and allow inspectlet through protective helmet
|
2015-04-14 23:04:54 -04:00 |
|
Michael Q Larson
|
6b671f7d1c
|
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
|
2015-04-14 19:39:51 -07:00 |
|
Michael Q Larson
|
d7a698f629
|
fix the field guide
|
2015-04-14 19:39:25 -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
|
da738ed82d
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-04-14 13:44:49 -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
|
d1e4175624
|
additional work on basejumps
|
2015-04-14 13:43:10 -07:00 |
|
terakilobyte
|
18bdefbfac
|
Add in message about twitter authorization being down temporarily to error handler
|
2015-04-14 16:17:58 -04:00 |
brndnb
|
a6d5721458
|
Switch from debug to console.log
|
2015-04-14 15:42:46 -04:00 |
|
brndnb
|
4fb119ab68
|
Add debug to app.js to troubleshoot twitter signin in production, unable to repliate locally
|
2015-04-14 15:36:02 -04:00 |
|
brndnb
|
7912dc722d
|
Update bonfire challenge in courseware to encourage people not to try to complete all bonfires back to back, and not to worry if new bonfires are added.
|
2015-04-14 11:15:06 -04:00 |
|
Michael Q Larson
|
77b5265fde
|
start creating the basejump instructions
|
2015-04-13 21:56:51 -05:00 |
|
brndnb
|
324e7fcbd3
|
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
|
2015-04-13 21:31:02 -04:00 |
|
brndnb
|
96ac90274d
|
Update User model to make migration easier and complete user migration script
|
2015-04-13 21:30:08 -04:00 |
|
Michael Q Larson
|
11548bfcf9
|
add checkbox cross off effect to challenges and reword pairwise bonfire
|
2015-04-13 02:41:42 -04:00 |
|
Michael Q Larson
|
83c14cccc4
|
continue work on user migration
|
2015-04-13 01:03:26 -04:00 |
|
Michael Q Larson
|
e98f445444
|
update the challenge sequencing
|
2015-04-13 00:02:21 -04:00 |
|
Michael Q Larson
|
f85804f270
|
start writing user migration for challenge completion
|
2015-04-12 02:07:01 -04:00 |
|
Nathan
|
9a16ddad0a
|
Merge pull request #290 from storbeck/ux-improvements
added 5 new bonfires
|
2015-04-12 00:02:10 -04:00 |
|
Michael Q Larson
|
332d4f1875
|
refactor story.js mailer and remove some cruft
|
2015-04-09 17:50:10 -07:00 |
|
Michael Q Larson
|
6f752b2437
|
minor tweaks to landing page
|
2015-04-09 13:06:36 -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 |
|
Quincy Larson
|
6deb527e98
|
Merge pull request #303 from FreeCodeCamp/slack
We're ready to move to slack from gitter thanks to @storbeck
|
2015-04-09 10:50:06 -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
|
9145e959de
|
able to use the api upon button click
|
2015-04-08 22:42:40 -07:00 |
|
Michael Q Larson
|
e3acdb9ebb
|
add slack key to secrets.js
|
2015-04-08 21:53:08 -07:00 |
|
Michael Q Larson
|
3b7ea3d9a4
|
start work on challenge-migraiton
|
2015-04-08 18:03:06 -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
|
73b536de95
|
update sitemap
|
2015-04-08 15:05:24 -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
|
c02fafa6a9
|
add status, turn hours into integer, create a directory view of all nonprofits
|
2015-04-08 14:36:05 -07:00 |
|
Michael Q Larson
|
61e07041a7
|
camper news reply emails go out to original story poster and poster of replied-to comment, works with old stories as well
|
2015-04-08 13:16:16 -07:00 |
|
Michael Q Larson
|
889de9c875
|
build other solutions page of links for nonprofits
|
2015-04-08 00:42:33 -07:00 |
|
Michael Q Larson
|
6242f322d7
|
still working on passing original author email all the way down the comment chain
|
2015-04-08 00:30:51 -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 |