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
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
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
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
8c48626f03
Add certification page
2015-10-05 15:55:50 -07:00
5c3973c365
Fix last completed logic bug
...
This PR fixes a regression introduced in an earlier patch
2015-10-02 10:50:35 -07:00
a90fdf1e0c
Fix check for existence
2015-10-01 23:58:56 -07:00
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
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
d0528ec768
fix re-encode uri during redirect
2015-10-01 21:11:15 -07:00
8a1a7f238d
fix undefined username and remove old function
...
fix many bugs and undefined
fix linting errors
2015-10-01 21:03:28 -07:00
d8fd63fb87
Merge branch 'staging' into merge-account-page
2015-10-01 20:39:56 -07:00
b197358056
make one page profile with bonfire solution urls
2015-09-30 21:04:16 -07:00
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
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
416a866ec0
add step based challenge to framework
2015-09-30 13:26:06 -07:00
03675ef0a6
finish QAing basic and intermediate bonfires
2015-09-30 01:33:07 -07:00
ab204c654e
fix search results formatting for mobile and desktop camper news
2015-09-29 22:52:19 -07:00
242351e0e4
Merge pull request #3541 from FreeCodeCamp/fix/last-challenge-name
...
fix check for existance when getting last challenge
2015-09-29 22:37:57 -07:00
cdf8c6a54c
fix check for existance when getting last challenge
2015-09-29 22:12:02 -07:00
ee9827ea58
fix issues with get-started and remove pair button
2015-09-29 17:59:16 -07:00
31f9b7d707
Merge pull request #3530 from FreeCodeCamp/map-share
...
add facebook sharing to map on completed challenges
2015-09-28 20:08:06 -07:00
c7d68932ce
Show share button from last completed
2015-09-28 19:47:45 -07:00
6a5bea67f7
set last completed block in map view
2015-09-28 19:20:29 -07:00
1ff55374db
improve facebook sharing copy
2015-09-28 19:04:44 -07:00
91efd5940d
add facebook sharing to map on completed challenges
...
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
7900628d2a
Merge pull request #3525 from FreeCodeCamp/feature/jobs
...
intermediate pull
2015-09-28 17:35:13 -07:00
27f231e72f
refactor tests to show same message when passing and failing
2015-09-27 23:22:06 -07:00
3e25b3a6bc
improve button html
2015-09-27 21:52:13 -07:00
e74533a727
add lockdown mode toggling
2015-09-27 17:08:56 -07:00
85a5766546
update the tshirt campaign text
2015-09-27 16:25:34 -07:00
5b5b37adff
fix tshirt version 2 not submitting properly bug
2015-09-27 14:00:55 -07:00
d08c3e5a88
Merge pull request #3514 from FreeCodeCamp/tshirt
...
Tshirt voting mechanism
2015-09-27 11:06:26 -07:00
a64a46cff1
don't show tshirt voting to brand new users
2015-09-27 11:05:44 -07:00
ccf5504537
add tshirt voting mechanism
2015-09-27 10:49:44 -07:00
0634926af0
add t-shirts to view
2015-09-27 01:44:09 -07:00
c985a0f16e
Merge pull request #3478 from FreeCodeCamp/remove-emails
...
remove email address from stories
2015-09-23 18:11:13 -07:00
de976c18ba
remove email address from stories
2015-09-23 15:20:45 -07:00
bf95314830
fix prevent redirect to /news/hot
2015-09-23 15:05:27 -07:00
29dab96b9b
Merge pull request #3475 from FreeCodeCamp/fix/redirect-whitelist
...
fix only allow redirects on whitelist
2015-09-23 14:55:10 -07:00
baab92e3a0
fix only allow redirects on whitelist
2015-09-23 14:54:08 -07:00
04bdb9677e
Merge pull request #3356 from leonfeng/fix/gooleapis
...
Replace Google-hosted scripts with cdnjs equivalents
2015-09-23 14:53:58 -07:00
e579cbd778
update to react-router 1.0.0-rc1
2015-09-21 12:54:33 -07:00
39fdd637d5
fix load fonts through css
...
attempt to cache font files and load after dom init
resulted in a visible jitter when fonts transitioned.
2015-09-21 12:16:10 -07:00
a682009025
Replace Google-hosted scripts with cdnjs equivalents
2015-09-19 08:55:04 +08:00
2fee89b0e6
fix invisible div blocking run button
...
bootstrap classes stack on smaller screens if breakpoints are not
met. This fix removes the smaller screen classes that forced divs
that would otherwise stack to instead overlay each other. This is
the cause of the run button being blocks on smaller screens as a
col that should stack to the bottom was instead being pushed to
top.
closes #1466
2015-09-17 12:42:31 -07:00
723b490932
load lato font after dom ready
2015-09-17 09:57:27 -07:00
38d76ec3bb
split fonts into two separate files
2015-09-17 00:06:01 -07:00
04727620e4
Merge branch 'leonfeng-enhancement-3311' of https://github.com/leonfeng/FreeCodeCamp into fix/fonts
2015-09-16 23:50:24 -07:00
6e53b8701d
Replace Google Fonts with locally served fonts
2015-09-17 04:53:33 +08:00
81cede35b4
Merge pull request #3325 from bugron/fix/news-no_results_found-padding
...
Fixes position of 'No Results Found' text
2015-09-16 22:21:09 +02:00
d302e7e16c
fixes position of 'No Results Found' text
2015-09-15 22:32:51 +04:00
829257194d
removes the checkbox and improves a condition
2015-09-15 20:27:36 +04:00
f659141746
Merge pull request #3292 from FreeCodeCamp/improve-map
...
adjust map font size and simplify Facebook share call to action
2015-09-14 14:15:50 -07:00
118c71e57e
fix css issue and use bower instead of files
2015-09-14 14:05:43 -07:00
e107b0e005
Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images
2015-09-14 13:43:34 -07:00
c6e3c89b7c
adds ability to 1-click expand images
2015-09-14 21:10:28 +04:00
953df6826b
fix merge conflicts
2015-09-14 00:02:42 -07:00
957a5329e5
adjust map font size and simplify Facebook share call to action
2015-09-13 20:26:33 -07:00
9fd22e8264
remove unnecessary class
2015-09-12 18:51:44 -07:00
044571a8be
Merge branch 'ahstro-3258' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3258
2015-09-12 18:27:25 -07:00
7f6bcaa704
Include code in issue + issue body improvements
...
This creates an auto-checked checkbox next to the 'Create my GitHub
issue'-button that, when checked, includes the camper's code in the body
sent to GitHub when creating a new issue.
Also includes some general improvements to how the way the issue
creation is handled and how the output looks.
2015-09-13 01:54:26 +02:00
ee92c923d7
Merge pull request #3254 from FreeCodeCamp/more-info
...
Reorient Search and Submit buttons on Camper News
2015-09-12 13:20:36 -07:00
4cd5168aac
reorient search and submit buttons to look more conventional
2015-09-11 23:30:10 -07:00
dfed1538c7
render individual job on request and window transition
2015-09-10 16:27:10 -07:00
e3ac50a0d5
remove old manifest file on request in dev
2015-09-10 16:27:09 -07:00
cd4ee10838
add job subroutes
2015-09-10 16:27:08 -07:00
0391faf5a2
fix meta tags for facebook
2015-09-09 23:05:58 -07:00
0791c99945
remove commit garbage
2015-09-09 20:47:46 -07:00
ca50f8250f
Merge pull request #3217 from QuincyLarson/signin-copy
...
improve signin page copy and move twitter to bottom of list
2015-09-09 20:41:59 -07:00
d02ad70913
Merge pull request #3205 from FreeCodeCamp/feature/ctrl-enter-submit
...
add ctrl enter press to submit on modal
2015-09-09 20:40:02 -07:00
40f53fc7c8
Merge pull request #3216 from QuincyLarson/unauthenticated-buttons
...
Help, Pair and Bug buttons for unauthenticated campers
2015-09-09 20:38:36 -07:00
7ab36aa785
Merge pull request #3207 from QuincyLarson/fb-share
...
Fb share button on map
2015-09-09 20:28:05 -07:00
5490557592
Merge pull request #3041 from QuincyLarson/meta
...
Update meta tags and copy
2015-09-09 20:20:32 -07:00
08907b8ddb
improve signin page copy and move twitter to bottom of list
2015-09-09 19:55:23 -07:00
c70fe77952
Merge branch 'staging' into unauthenticated-buttons
...
Conflicts:
server/views/coursewares/showVideo.jade
server/views/coursewares/showZiplineOrBasejump.jade
2015-09-09 19:54:13 -07:00
ee9a2d681f
make help, pair, bug buttons accessible to unauthenticated campers
2015-09-09 19:51:24 -07:00
d3e77f1282
add ctrl enter press to submit on modal
...
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 19:33:01 -07:00
a5f30414ab
Merge pull request #3206 from QuincyLarson/more-info
...
remove unnecessary elipses from more info buttons
2015-09-09 18:59:56 -07:00
4d427f8318
simplify modal animations and close #2792
2015-09-09 18:55:20 -07:00
0eeb6891f7
Merge branch 'staging' into fb-share
2015-09-09 13:47:54 -07:00
501bd51e8b
remove unnecessary elipses from more info buttons
2015-09-09 13:38:18 -07:00
2896cee8f5
simplify fb-share call to action and minimize sizze
2015-09-09 00:10:36 -07:00
cfba4edb29
add further code to be QAd after sleeping
2015-09-08 23:48:11 -07:00
c4c9068950
start refactoring account view into show view
2015-09-08 22:52:32 -07:00
b2d04ec7c5
remove save to user on return individual user
2015-09-08 22:41:03 -07:00
9cc862e9a6
add learn button functionality
...
learn button looks for current challenge in localStorage
if not present sends user to map
2015-09-08 22:31:20 -07:00
184ba1fa37
add challengeId to localStorage
...
remove unneeded current challenge route
2015-09-08 22:18:25 -07:00
f0a4924671
start refactoring next challenge logic
2015-09-08 21:45:53 -07:00
Berkeley Martinez
Quincy Larson
Quincy Larson
Leon Feng
Anton Strömkvist
Arsen Melikyan