Commit Graph

5568 Commits

Author SHA1 Message Date
780e0ead43 Merge branch 'staging' into feature/commit 2015-10-06 23:20:14 -07:00
b574b2f357 Merge pull request #3618 from FreeCodeCamp/feature/add-isBeta-flag
Add ability to filter beta challenges from production
2015-10-06 23:18:45 -07:00
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
2864f607cc Add on certification, complete goal and stop pledge 2015-10-06 21:12:40 -07:00
49c06b266e Add complete commit endpoint 2015-10-06 19:51:19 -07:00
0b716c0057 Add stop commit functionality 2015-10-06 19:51:19 -07:00
d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00
362efd4365 Add display on user profile when user commits 2015-10-06 19:51:19 -07:00
c8da944caf Add logic to load nonprofit on query
Add logic to model update
2015-10-06 19:51:19 -07:00
bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
d1c0276f4e fix spiffy up the commit form 2015-10-06 19:51:19 -07:00
3f96490aff Add pledge model 2015-10-06 19:51:19 -07:00
00b54e3d1f added optional space to the editor match in OOP challenges.
closes #3331
2015-10-06 20:37:32 -04:00
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
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
2b1652942e Merge pull request #3609 from gsvolt/bug3607
renamed -you- to -your- ; fixes a simple grammar bug in english
2015-10-07 01:14:27 +02:00
a6789b8511 renamed -you- to -your- ; fixes #3607 - grammar bug 2015-10-06 17:30:27 -04:00
a17687116e Fix Waypoint: Find Whitespace spelling and grammar. 2015-10-06 08:45:21 -07:00
2c0a705ff5 Merge pull request #3593 from formap/fix/2467-missing-bootstrap
Fix bootstrap fluid containers wording issue
2015-10-06 19:20:51 +04:00
57b9e25285 Merge pull request #3572 from ahstro/fix/truncate-typo
Truncate a string: Minor typo
2015-10-06 18:25:14 +04:00
1fe18ba4a5 Merge pull request #3605 from ahstro/fix/whitespace-test
'Regular Expressions'-waypoint improvements
2015-10-06 17:52:54 +04:00
7a31cdd922 'Regular Expressions'-waypoint improvements
* Remove unnecessary `i`-flag from tests and test messages,
  e.g. `/\s+/gi` => `/\s+/g`
* Remove dupliate backslashes from regex test messages,
  e.g. `/\\s+/g` => `/\s+/g`

The two backslashes were probably just an accident caused by how
multiple escapes are necessary with the current way tests are handled.
The `i`-flag was just unnecessary since its purpose is to ignore the
case of alphabetic characters.
2015-10-06 15:13:53 +02:00
91708a3316 Fix Waypoint: Find White Space Explaination
Changed text description to make it clear that `\s` is used to find all types of whitespace characters, not just `" "`.
Closes #2838
2015-10-05 22:50:09 -07:00
e404e74187 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:44:29 -07:00
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
d78d7a3fa1 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:43:17 -07:00
9a0505f782 add github linking enforcement 2015-10-05 22:42:42 -07:00
e6afda62c7 Add 5 dollar option to commit 2015-10-05 22:19:56 -07:00
e16efc832c Move commit to separate router 2015-10-05 22:19:56 -07:00
f02b3ffd4c update commit copy 2015-10-05 22:19:56 -07:00
68b12caf48 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -07:00
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
9bce039e7a Merge pull request #3602 from FreeCodeCamp/fix/share-able-url-solution-undefined
fix shareable challenges solution undefined
2015-10-05 22:09:03 -07:00
c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
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
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
202d0fa068 Fix add to completed challenges on cert verify 2015-10-05 19:58:44 -07:00
bf4ccab586 Merge pull request #3570 from FreeCodeCamp/feature/certificates
Add certification page
2015-10-05 17:19:17 -07:00
34efc43f6a update copy of certificate flows 2015-10-05 17:18:35 -07:00
8f84596142 Fix 500 out of range bug when completing last challenge 2015-10-05 16:38:58 -07:00
fc17e266fb Merge branch 'staging' into feature/certificates 2015-10-05 16:30:01 -07:00
8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
c04832d618 fix bootstrap fluid containers wording issue
Closes #2467.
2015-10-05 21:26:18 +02:00
4b05a6edc7 Merge pull request #3586 from josephbreihan/fix/typoissue-3585
Fix minor typo
2015-10-05 10:24:34 +02:00
dc4f5212c2 Fix typo described in issue #3585 2015-10-04 23:20:09 -04:00
b2bf3ce391 Truncate a string: Minor typo
The assert message said `1`, instead of the number `11` that was
actually being used in the assertion.
2015-10-03 11:23:41 +02:00
d9332e7d03 Merge pull request #3559 from QuincyLarson/map-restructure
restructure challenges and add certificate challenge skeletons
2015-10-02 12:05:48 -07:00
c688082ee4 add appropriate challenges to certificate challenges 2015-10-02 11:44:29 -07:00
465835d6b1 Merge branch 'staging' into map-restructure
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/intermediate-ziplines.json
2015-10-02 11:23:54 -07:00
08de1ac8bb Merge pull request #3568 from FreeCodeCamp/fix/travis
fix travis yaml and test challenges
2015-10-02 11:23:24 -07:00