Commit Graph

20681 Commits

Author SHA1 Message Date
Berkeley Martinez
c84a25c582 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
Berkeley Martinez
12f2aa9957 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
Quincy Larson
34c65633c0 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
Quincy Larson
dc54e37df6 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
Berkeley Martinez
cd5d7ac8e8 lint json 2015-08-13 15:42:17 -07:00
Berkeley Martinez
8cfdd4c742 add environmental vars to pm2start instead of hardcoding 2015-08-13 15:42:17 -07:00
Berkeley Martinez
146f42ef41 lint json 2015-08-13 15:42:17 -07:00
Berkeley Martinez
70d2810306 remove accordian 2015-08-13 15:41:30 -07:00
Berkeley Martinez
acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -07:00
Quincy Larson
9275bd5076 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
Quincy Larson
fea723efbd Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
Quincy Larson
837d412777 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
Quincy Larson
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
Quincy Larson
b14990dd63 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
Quincy Larson
0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
Quincy Larson
c801b4b907 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
Quincy Larson
2711664505 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
benmcmahon100
74ba74bb3b Added a more specific example 2015-08-13 21:25:31 +01:00
benmcmahon100
095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
043ef69d2f start adding json challenges 2015-08-13 12:55:50 -07:00
Quincy Larson
4cdd0e20d9 start adding json challenges 2015-08-13 12:55:50 -07:00
benmcmahon100
d881c14070 Add some code highlighting 2015-08-13 17:36:02 +01:00
benmcmahon100
299405694b Add some code highlighting 2015-08-13 17:36:02 +01:00
benmcmahon100
b470523d89 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
benmcmahon100
c0140a9510 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
benmcmahon100
5905e19e1b Merge remote-tracking branch 'origin/OOPF' into OOPF 2015-08-13 12:57:14 +01:00
Quincy Larson
40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00
Quincy Larson
c50b9c5afa Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 00:57:42 -07:00
Quincy Larson
2bbb2bd541 remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
Quincy Larson
66bd9338ab remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
Quincy Larson
3aacf90018 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Quincy Larson
1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Berkeley Martinez
0262d1b676 fix github link
link callback uri should have some path as auth callback uri
2015-08-12 21:44:55 -07:00
Quincy Larson
19fbd00ed8 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson
bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson
024cf33f34 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Quincy Larson
99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez
e76b5c8e7f remove codemirror docs from tracking 2015-08-12 21:01:07 -07:00
Berkeley Martinez
3196824b61 remove unnecessary codemirror modes 2015-08-12 20:49:44 -07:00
Berkeley Martinez
ac5f8b9d9a remove unneccassry demo dir from codemirror
closes #1730
2015-08-12 20:42:37 -07:00
Berkeley Martinez
7eaccffd15 remove hikes from map
closes #1682
2015-08-12 20:39:40 -07:00
Berkeley Martinez
cd9dcc6953 hide react routes 2015-08-12 20:32:27 -07:00
Berkeley Martinez
30070c4f74 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
Berkeley Martinez
cc2e7a69f9 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
Quincy Larson
315b78fb69 update copy on onboarding 2015-08-12 20:27:46 -07:00
Berkeley Martinez
4b0a9bef0a fix social auth scheme
closes #1734
2015-08-12 20:10:12 -07:00
Berkeley Martinez
eb07cbfea6 fix override user identity login to reformat provider 2015-08-12 20:10:12 -07:00
Berkeley Martinez
fc29c1fd9b linking accounts now works.
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
Berkeley Martinez
a4e220e2bc Move auth functions to central location 2015-08-12 20:10:11 -07:00
Berkeley Martinez
60189e2428 fix angular.js typo
closes #1287
2015-08-12 20:05:06 -07:00