Commit Graph

4150 Commits (4ff54006d3007042bb508e2ed26cdf7fea3f2885)

Author SHA1 Message Date
benmcmahon100 4ff54006d3 Merge remote-tracking branch 'origin/staging' into staging 2015-08-05 15:39:18 +01:00
benmcmahon100 ceed3c4877 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson 3c4142c92c fix profile update button 2015-08-04 18:43:40 -07:00
Quincy Larson 3551cefb3d simplify account.jade view for github integration 2015-08-04 18:29:05 -07:00
Quincy Larson 989cb87c00 add redirect for now vanished field guide articles 2015-08-04 18:00:01 -07:00
Quincy Larson 61aed73fa8 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 15:15:33 -07:00
Quincy Larson 5f2ec0aeae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
nto staging
2015-08-04 15:10:15 -07:00
Berkeley Martinez d752e5b487 on login double check that github username
if different, assign user to new name
2015-08-04 15:09:42 -07:00
Quincy Larson 7246945b42 remove bonfires from campers' public portfolios 2015-08-04 15:09:20 -07:00
Berkeley Martinez e01876f3ab disable username updating when camper is githubCool 2015-08-04 15:03:33 -07:00
Quincy Larson 73f0dcf732 make wiki open in new tab 2015-08-04 14:58:24 -07:00
Quincy Larson 041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Berkeley Martinez 9196d1c48e add github check on login with github. 2015-08-04 14:52:29 -07:00
Quincy Larson df786eaf2b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 14:40:56 -07:00
Quincy Larson 0682857236 remove learn link from navbar 2015-08-04 14:40:47 -07:00
Berkeley Martinez 2dc9934da2 add user.isGithubCool check
if user signs up with github, they become GithubCool.
2015-08-04 13:41:10 -07:00
Berkeley Martinez ce0b3b35c0 Merge pull request #1514 from royshouvik/patch-1
Update main.less to fix #1510
2015-08-04 12:37:26 -07:00
Berkeley Martinez c9e0184387 Merge pull request #1508 from flota113/flota113-1502
Small Fix of Bootstrap waypoint challenge - Issue 1502
2015-08-04 12:35:08 -07:00
Berkeley Martinez 00a9cfdf48 Merge pull request #1517 from ngalluzzo/fix-class-typo
Typo on 'Responsive Design with Bootstrap'
2015-08-04 12:34:47 -07:00
Berkeley Martinez 276f48e463 Merge pull request #1527 from benflinn/patch-3
Update bootstrap.json
2015-08-04 12:33:59 -07:00
Ben ecacbc6233 Update bootstrap.json
fixed typo (misspelled 'container')
2015-08-04 14:03:19 -05:00
Berkeley Martinez 70c5bcea20 fix error message string 2015-08-04 10:52:41 -07:00
Nic Galluzzo ad46b72bd0 Update bootstrap.json 2015-08-04 08:54:21 -07:00
Shouvik Roy c05a936c87 Update main.less to fix #1510
Update main.less to fix #1510. There was an alignment issue on Safari because of missing vendor prefix ```-webkit``` on ```transform``` on the ```.points-on-top``` class.
2015-08-04 20:47:25 +05:30
Berkeley Martinez c8488c8419 reremove extra middlewares from server file 2015-08-04 06:28:10 -07:00
Marcin Flotyński dbf8443430 Small Fix of Bootstrap waypoint challenge - Issue 1502
Changed second check for second class - 'btn-default'
2015-08-04 15:00:22 +02:00
benmcmahon100 fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Berkeley Martinez a1a64435d6 readding twitter auth
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
Berkeley Martinez 43d74c2f48 add beta warning banner 2015-08-04 01:34:26 -07:00
Berkeley Martinez efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
Berkeley Martinez f01a66c5c7 use (LMP)loopback middleware phases
bump loopback-component-passport which uses LMP
move custom middlewares to middlewares directory
2015-08-04 01:34:26 -07:00
Quincy Larson aa10e1ff69 quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson eb8b9df5ad Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100 e6f14fc25f Merge remote-tracking branch 'origin/staging' into staging 2015-08-04 00:53:34 +01:00
benmcmahon100 aa906f81c3 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1450 missing semi-colon and assert( 2015-08-04 00:53:20 +01:00
Berkeley Martinez a920e16cb9 fix completedWith.toLowerCase bug 2015-08-03 16:35:22 -07:00
Berkeley Martinez 4c94bf7fcd Merge pull request #1231 from ahstro/lumenteun-410
Improved consitency in 'Friendly Date Ranges' test cases.
2015-08-03 16:04:37 -07:00
Berkeley Martinez 2f1d9c4826 Merge pull request #1197 from 1hella/1hella-1156
Fix typos in Bonfire: Friendly Date Ranges #1156
2015-08-03 16:02:50 -07:00
Berkeley Martinez 8deb7b0f53 Merge pull request #1485 from djordjelacmanovic/djordjelacmanovic-1473
fixed a typo as per issue 1473
2015-08-03 15:46:50 -07:00
Djordje Lacmanović c9db4191c2 fixed a typo as per issue 1473 2015-08-04 00:39:11 +02:00
Berkeley Martinez 7cf6b4e683 Merge pull request #1470 from cahlan/patch-2
add devmount bootcamp new location
2015-08-03 15:13:36 -07:00
Quincy Larson 44f52b5f06 Update and add wiki link 2015-08-03 13:49:16 -07:00
Quincy Larson 041779de76 Update README.md 2015-08-03 13:47:07 -07:00
Berkeley Martinez 7ca1d7cfde remove facebook/google/linkedin auth from linking 2015-08-03 12:53:23 -07:00
benmcmahon100 6c0049803d Fixed two typos and fixed a no tests tun error 2015-08-03 20:43:23 +01:00
Berkeley Martinez bf1c2ace00 disable facebook/google/linked auth for testing 2015-08-03 12:38:20 -07:00
benmcmahon100 4be714aa97 Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework 2015-08-03 18:02:26 +01:00
benmcmahon100 2f5b7a7db2 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1433 blocked tests passing when exploit used 2015-08-03 17:12:48 +01:00
benmcmahon100 c9c2a74461 Hardened The check-the-length-property-of-a-string-variable challenge to make it hard to get no tests run 2015-08-03 17:01:27 +01:00