Commit Graph

262 Commits

Author SHA1 Message Date
Quincy Larson
fd7451e233 Merge branch 'staging' into improve-early-challenges
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-10-28 02:20:09 -07:00
Quincy Larson
63f56c94b8 continue refining waypoints 2015-10-27 17:49:58 -07:00
Quincy Larson
4910118366 update flash message 2015-10-23 14:12:09 -07:00
Quincy Larson
1db84d1455 Merge branch 'staging' into feature/block-camper-news 2015-10-23 14:08:19 -07:00
Berkeley Martinez
c13bdb65e5 Add camper must be auth with gitub to post to news 2015-10-21 22:05:27 -07:00
Berkeley Martinez
43155e85e8 Merge pull request #3848 from FreeCodeCamp/feature/nonprofit-ids
Feature/nonprofit ids
2015-10-21 21:41:48 -07:00
Quincy Larson
1dc0e868b9 update nonprofit files and delete old commented code 2015-10-21 21:30:47 -07:00
Quincy Larson
7f2f3885f8 change blog links to lead to medium subdomain 2015-10-19 21:55:29 -07:00
Berkeley Martinez
3e828ba266 Merge pull request #3727 from QuincyLarson/estimates
Time estimates for each block of challenge (by popular request)
2015-10-13 15:49:39 -07:00
Quincy Larson
f30239fb6c add time estimates to challenge blocks on map 2015-10-12 22:56:10 -07:00
Berkeley Martinez
7b444b15dc Update loopback, ThunderCats and RxJS.
closes #2929
2015-10-11 17:35:46 -07:00
Quincy Larson
920d9ba403 Merge pull request #3655 from FreeCodeCamp/fix/remove-unused-endpoint
Remove unused jobs-form endpoint
2015-10-08 15:31:09 -07:00
Quincy Larson
ce57a13a88 Merge pull request #3657 from FreeCodeCamp/fix/harded-certs
Harden showCert against errors
2015-10-08 15:30:13 -07:00
Berkeley Martinez
0dc35f2b0a Fix show certs to anon user
closes #3648
2015-10-08 09:02:35 -07:00
Berkeley Martinez
ba88def035 Harden showCert against errors 2015-10-08 08:48:52 -07:00
Berkeley Martinez
76618efcd0 Remove unused jobs-form endpoint 2015-10-08 08:12:48 -07:00
Berkeley Martinez
1695a760ef Fix check for _id as well as id during certification 2015-10-07 16:30:51 -07:00
Berkeley Martinez
0cb8c6c58b hot patch/ prevent dedube 2015-10-07 06:05:33 -07:00
Berkeley Martinez
c6914fa205 Fix small typo on certification challenge 2015-10-07 02:22:04 -07:00
Berkeley Martinez
f2679810a9 fix some typos in commit and getting started 2015-10-07 02:11:23 -07:00
Berkeley Martinez
0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
Berkeley Martinez
a906b8f411 Fix firstChallenge var should point to new first challenge 2015-10-07 01:14:33 -07:00
Berkeley Martinez
241ca8097d Fix link errors in randomAPIs 2015-10-07 00:28:42 -07:00
Berkeley Martinez
7a4f5d752c Move labs/stories to server/resources
Rename stories to testimonials to reduce confusion
2015-10-07 00:26:17 -07:00
Quincy Larson
4f26d82f65 add labs and stories 2015-10-07 00:17:18 -07:00
Quincy Larson
56673d429d add labs 2015-10-07 00:17:17 -07:00
Berkeley Martinez
92b9f71532 Add commit directory page 2015-10-07 00:05:26 -07:00
Berkeley Martinez
f5966c0959 Change redirect and text on commit 2015-10-06 23:33:17 -07:00
Berkeley Martinez
44fd85dff8 Add ability to filter beta challenges from production
This PR adds the ability to test out challenges in beta
without fear that they will leak to production servers.

In development all challenges will display.

In production all challenges marked 'isBeta' will be filtered out
except in the case the environmental variable `BETA` is set ture,
in which case all challenges will display.
2015-10-06 22:37:08 -07:00
Berkeley Martinez
2864f607cc Add on certification, complete goal and stop pledge 2015-10-06 21:12:40 -07:00
Berkeley Martinez
49c06b266e Add complete commit endpoint 2015-10-06 19:51:19 -07:00
Berkeley Martinez
0b716c0057 Add stop commit functionality 2015-10-06 19:51:19 -07:00
Berkeley Martinez
d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00
Berkeley Martinez
362efd4365 Add display on user profile when user commits 2015-10-06 19:51:19 -07:00
Berkeley Martinez
c8da944caf Add logic to load nonprofit on query
Add logic to model update
2015-10-06 19:51:19 -07:00
Berkeley Martinez
bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
Quincy Larson
914f2ef0b8 Merge pull request #3611 from FreeCodeCamp/fix/replace-script-tag-in-url
Fix replace script tags in URL
2015-10-06 16:48:37 -07:00
Berkeley Martinez
33e8f35bbf Fix replace script tags in URL
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
Quincy Larson
ebe0165fba Merge pull request #3601 from FreeCodeCamp/fix/user-certs-edge-cases
Fix/user certs edge cases
2015-10-05 22:43:39 -07:00
Quincy Larson
9a0505f782 add github linking enforcement 2015-10-05 22:42:42 -07:00
Berkeley Martinez
e16efc832c Move commit to separate router 2015-10-05 22:19:56 -07:00
Quincy Larson
68b12caf48 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -07:00
Quincy Larson
84eb5ac810 Merge pull request #3596 from FreeCodeCamp/fix/500-out-of-range-bug
Fix 500 out of range bug when completing last challenge
2015-10-05 22:15:26 -07:00
Berkeley Martinez
85f2c005cd fix shareable challenges solution undefined
During challenges when a user tries to navigate to a challenge
and hits the name redirect, the solution is filled with
undefined starting the user with an empty box.
This PR fixes the issue by ignoring the solution param
if it is empty
2015-10-05 20:18:52 -07:00
Berkeley Martinez
188da02ffc Fix disable cert
Disable certificate when user is locked to the public
or when they haven't signed academic honesty
2015-10-05 20:00:25 -07:00
Berkeley Martinez
202d0fa068 Fix add to completed challenges on cert verify 2015-10-05 19:58:44 -07:00
Quincy Larson
34efc43f6a update copy of certificate flows 2015-10-05 17:18:35 -07:00
Berkeley Martinez
8f84596142 Fix 500 out of range bug when completing last challenge 2015-10-05 16:38:58 -07:00
Berkeley Martinez
8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
Berkeley Martinez
5c3973c365 Fix last completed logic bug
This PR fixes a regression introduced in an earlier patch
2015-10-02 10:50:35 -07:00