Quincy Larson
60d059f71e
remove angular from bower file and scripts
2015-10-06 16:17:31 -07:00
Quincy Larson
b8dc81214d
Merge branch 'staging' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
2015-10-06 16:00:59 -07:00
Quincy Larson
e404e74187
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-10-05 22:44:29 -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
d78d7a3fa1
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-10-05 22:43:17 -07:00
Quincy Larson
9a0505f782
add github linking enforcement
2015-10-05 22:42:42 -07:00
Berkeley Martinez
e6afda62c7
Add 5 dollar option to commit
2015-10-05 22:19:56 -07:00
Berkeley Martinez
e16efc832c
Move commit to separate router
2015-10-05 22:19:56 -07:00
Quincy Larson
f02b3ffd4c
update commit copy
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
Quincy Larson
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
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
bf4ccab586
Merge pull request #3570 from FreeCodeCamp/feature/certificates
...
Add certification page
2015-10-05 17:19:17 -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
Quincy Larson
fc17e266fb
Merge branch 'staging' into feature/certificates
2015-10-05 16:30:01 -07:00
Berkeley Martinez
8c48626f03
Add certification page
2015-10-05 15:55:50 -07:00
Anton Strömkvist
4b05a6edc7
Merge pull request #3586 from josephbreihan/fix/typoissue-3585
...
Fix minor typo
2015-10-05 10:24:34 +02:00
Joseph Breihan
dc4f5212c2
Fix typo described in issue #3585
2015-10-04 23:20:09 -04:00
Berkeley Martinez
d9332e7d03
Merge pull request #3559 from QuincyLarson/map-restructure
...
restructure challenges and add certificate challenge skeletons
2015-10-02 12:05:48 -07:00
Quincy Larson
c688082ee4
add appropriate challenges to certificate challenges
2015-10-02 11:44:29 -07:00
Quincy Larson
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
Quincy Larson
08de1ac8bb
Merge pull request #3568 from FreeCodeCamp/fix/travis
...
fix travis yaml and test challenges
2015-10-02 11:23:24 -07:00
Berkeley Martinez
86344d5c9e
fix travis yaml and test challenges
2015-10-02 11:19:07 -07:00
Quincy Larson
7709438fa3
Merge pull request #3567 from FreeCodeCamp/fix/last-completed-regression
...
Fix last completed logic bug
2015-10-02 11:11:26 -07:00
Berkeley Martinez
c819fcc0cb
Merge pull request #3561 from FreeCodeCamp/remove-difficulty
...
remove vestigial difficulty attribute from challenges
2015-10-02 11:00:11 -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
Quincy Larson
ea33385fea
remove vestigial difficulty attribute from challenges
2015-10-02 01:06:27 -07:00
Quincy Larson
42b77e92f8
Merge pull request #3560 from FreeCodeCamp/fix/common-is-undefined
...
Fix check for existence
2015-10-02 00:11:26 -07:00
Berkeley Martinez
a90fdf1e0c
Fix check for existence
2015-10-01 23:58:56 -07:00
Quincy Larson
69a3729025
restructure challenges and add certificate challenge skeletons
2015-10-01 23:54:20 -07:00
Quincy Larson
5f9022475c
Merge pull request #3558 from FreeCodeCamp/feature/show-waypoints
...
Feature show Waypoints on user profile page
2015-10-01 23:09:03 -07:00
Berkeley Martinez
ee35fe075c
Feature show Waypoints on user profile page
...
This PR also fixes some bugs in lockedDown mode
2015-10-01 23:03:52 -07:00
Quincy Larson
7563b94509
Merge pull request #3557 from FreeCodeCamp/feature/make-completed-challenges-unique
...
feature make completedChallenges uniq
2015-10-01 22:28:57 -07:00
Berkeley Martinez
6c305dbc67
feature make completedChallenges uniq
...
now when users complete a challenge, it will instead update the
last save if it exists.
2015-10-01 22:19:26 -07:00
Berkeley Martinez
fefefed0f2
Merge pull request #3550 from FreeCodeCamp/merge-account-page
...
Merge account page
2015-10-01 21:12:23 -07:00
Berkeley Martinez
d0528ec768
fix re-encode uri during redirect
2015-10-01 21:11:15 -07:00
Berkeley Martinez
8a1a7f238d
fix undefined username and remove old function
...
fix many bugs and undefined
fix linting errors
2015-10-01 21:03:28 -07:00
Quincy Larson
d8fd63fb87
Merge branch 'staging' into merge-account-page
2015-10-01 20:39:56 -07:00
Quincy Larson
28e9dce221
Merge pull request #3551 from FreeCodeCamp/feature/uri-storage
...
add uri code storage
2015-10-01 19:44:12 -07:00
Aniruddh Agarwal
fa89ff3471
Merge pull request #3376 from natac13/fix/slasher-flick-unclear-head-of-array
...
fix unclear description slasher flick
2015-10-02 05:20:28 +08:00
Berkeley Martinez
72e0595ca6
add uri code storage
2015-09-30 22:32:31 -07:00
Quincy Larson
b197358056
make one page profile with bonfire solution urls
2015-09-30 21:04:16 -07:00
Berkeley Martinez
5de6837959
Merge pull request #3548 from FreeCodeCamp/converge-bonfires
...
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
Quincy Larson
77892a05c0
Merge pull request #3546 from FreeCodeCamp/step
...
add step based challenge to framework
2015-09-30 19:38:01 -07:00
Quincy Larson
c2af4f9b4c
fix bad merge
2015-09-30 19:26:05 -07:00
Quincy Larson
dca179c2c5
Merge branch 'staging' into converge-bonfires
...
Conflicts:
seed/challenges/basic-bonfires.json
seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00