Commit Graph

4335 Commits

Author SHA1 Message Date
cc2e7a69f9 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
4b0a9bef0a fix social auth scheme
closes #1734
2015-08-12 20:10:12 -07:00
eb07cbfea6 fix override user identity login to reformat provider 2015-08-12 20:10:12 -07:00
fc29c1fd9b linking accounts now works.
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
a4e220e2bc Move auth functions to central location 2015-08-12 20:10:11 -07:00
49e9d078f1 fix angular.js typo
closes #1287
2015-08-12 20:05:06 -07:00
8cdc545f71 minor ux improvement to onboarding 2015-08-12 18:25:43 -07:00
e36dd9970a fix rx long stack trace support 2015-08-12 11:47:03 -07:00
ca01115674 fix next challenge unknown bug
closes #1725
2015-08-12 11:47:03 -07:00
7a2c2544a4 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
5c1b45da2e Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
84c76bcfd0 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
88b6b8a9d8 make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
096eb0a67e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
ae0175b396 Merge pull request #1643 from Greenheart/greenheart-1628
clarified description for waypoint: make images mobile responsive
2015-08-12 01:23:18 -07:00
c408bbe20b manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
75b54a395e Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
2c623ad78a Merge pull request #1655 from ahstro/ahstro-1647
'Convert HTML Entities' now allows upper and lower case entities
2015-08-12 01:13:14 -07:00
a9bea09cc9 make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
690369f76a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/jquery-ajax-and-json.json
2015-08-12 01:06:03 -07:00
9e128e2787 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
e7f4fdc5cf Merge pull request #1617 from ahstro/target-elements
Improves 'Target Elements by ID Using jQuery'
2015-08-12 00:55:20 -07:00
5830ac2f8a make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
82e03b579c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
e42e954517 fix omission in simon zipline 2015-08-11 23:53:30 -07:00
0838486483 properly define id fields for basic models
closes #1724
2015-08-11 14:49:57 -07:00
0fcf3bcf42 fix challenge completion should give brownie points
closes #1665
2015-08-11 14:17:08 -07:00
6fd19738ce refactor and lint home router 2015-08-11 13:22:16 -07:00
7348cff96e Update README.md 2015-08-11 12:49:37 -07:00
bfcd36ff88 Merge pull request #1716 from sonorangirl/slot-machine-challenge
Slot machine challenge - Fixed Typos and 4th test
2015-08-11 13:43:00 +01:00
ba5d845ac6 Merge pull request #1537 from benflinn/patch-1
Update bootstrap.json
2015-08-11 13:12:16 +01:00
2256f3ef6e fix add github link to passport 2015-08-10 23:38:10 -07:00
5f21db457d fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
43e3dc8914 Finish onboarding page 2015-08-10 21:55:13 -07:00
341d931833 fix streak show days 2015-08-10 21:01:37 -07:00
666f7377d5 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-10 20:55:14 -07:00
7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -07:00
34a06f987f Merge pull request #1512 from djordjelacmanovic/djordjelacmanovic-1511
fixed issue #1511 - now checking for words longer than 9 chars
2015-08-10 20:40:39 -07:00
6691897dbe Merge pull request #1612 from ahstro/ahstro-1467
Improve 'Turn an image to a Link'-waypoint
2015-08-10 20:25:54 -07:00
e7a4ec068c Merge pull request #1614 from ahstro/ahstro-1461
Grammatical error in 'Use Hex Code for Specific Colors'
2015-08-10 20:23:29 -07:00
f67b37ff7b Merge pull request #1616 from ahstro/ahstro-1451
Wrong element in 'Target HTML Elements with Selectors Using jQuery'
2015-08-10 20:21:59 -07:00
44cf78afab Merge pull request #1715 from FreeCodeCamp/onboarding
Onboarding
2015-08-10 20:16:10 -07:00
853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
8ee3306bee Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
d37a1a1a08 Merge pull request #1671 from ahstro/ahstro-1402
Disregard order in 'Symmetric Difference'
2015-08-10 19:11:33 -07:00
a557f386ed Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
041ef43be3 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00