Commit Graph

4165 Commits

Author SHA1 Message Date
974bf503ec Merge pull request #1572 from cristianvnica/cristianvnica-1571
Trying to fix: #1571
2015-08-05 20:43:17 +01:00
b7e39cd950 Update .gitattributes 2015-08-05 12:27:07 -07:00
1ca6bd9c60 Create .gitattributes
This should fix out Github language statistics
2015-08-05 12:25:52 -07:00
40cdf76035 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
01e408d48c new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
5ff371fc6f Trying to fix: #1571
I have found a small typo on challenge: An Array Of new Information
2015-08-05 21:55:25 +03:00
7f9c3b46cd fix typo directory should be plural 2015-08-05 11:48:12 -07:00
71ca6b1b5b mark if user is github cool during migration 2015-08-05 11:22:58 -07:00
f656311b3e remove comments from migration 2015-08-05 11:22:58 -07:00
23bc0787a8 Merge remote-tracking branch 'origin/staging' into staging 2015-08-05 17:31:55 +01:00
f68c6d0fa3 Changed the object lessons to use dot notation instead of bracket
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
2015-08-05 17:31:42 +01:00
b004e7e889 Merge pull request #1563 from cristianvnica/cristianvnica-1562
Trying to fix issue #1562
2015-08-05 17:18:32 +01:00
61c8eb1595 Trying to fix issue #1562
In Use Bracket Notation to Find the Nth to Last Character in a String:
There is a mistake in the code sample:

It should be: var thirdToLastLetterOfFirstName =
firstName[firstName.length - 3];
but is: var thirdToLastLetterOfFirstName = firstName[firstName.length -
2];
2015-08-05 19:08:49 +03:00
91c7bce758 Font on submit buttons should be correct now 2015-08-05 17:04:02 +01:00
e7cac3ccf9 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
4ff54006d3 Merge remote-tracking branch 'origin/staging' into staging 2015-08-05 15:39:18 +01:00
ceed3c4877 Fix some typos 2015-08-05 15:38:54 +01:00
3c4142c92c fix profile update button 2015-08-04 18:43:40 -07:00
3551cefb3d simplify account.jade view for github integration 2015-08-04 18:29:05 -07:00
989cb87c00 add redirect for now vanished field guide articles 2015-08-04 18:00:01 -07:00
61aed73fa8 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 15:15:33 -07:00
5f2ec0aeae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
nto staging
2015-08-04 15:10:15 -07:00
d752e5b487 on login double check that github username
if different, assign user to new name
2015-08-04 15:09:42 -07:00
7246945b42 remove bonfires from campers' public portfolios 2015-08-04 15:09:20 -07:00
e01876f3ab disable username updating when camper is githubCool 2015-08-04 15:03:33 -07:00
73f0dcf732 make wiki open in new tab 2015-08-04 14:58:24 -07:00
041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
9196d1c48e add github check on login with github. 2015-08-04 14:52:29 -07:00
df786eaf2b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 14:40:56 -07:00
0682857236 remove learn link from navbar 2015-08-04 14:40:47 -07:00
2dc9934da2 add user.isGithubCool check
if user signs up with github, they become GithubCool.
2015-08-04 13:41:10 -07:00
ce0b3b35c0 Merge pull request #1514 from royshouvik/patch-1
Update main.less to fix #1510
2015-08-04 12:37:26 -07:00
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
00a9cfdf48 Merge pull request #1517 from ngalluzzo/fix-class-typo
Typo on 'Responsive Design with Bootstrap'
2015-08-04 12:34:47 -07:00
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
70c5bcea20 fix error message string 2015-08-04 10:52:41 -07:00
ad46b72bd0 Update bootstrap.json 2015-08-04 08:54:21 -07:00
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
c8488c8419 reremove extra middlewares from server file 2015-08-04 06:28:10 -07:00
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
fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
a1a64435d6 readding twitter auth
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
43d74c2f48 add beta warning banner 2015-08-04 01:34:26 -07:00
efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
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
aa10e1ff69 quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
eb8b9df5ad Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
e6f14fc25f Merge remote-tracking branch 'origin/staging' into staging 2015-08-04 00:53:34 +01:00