Commit Graph

4384 Commits

Author SHA1 Message Date
a99a1a50bd Merge pull request #1746 from ahstro/es6-tests
Mocha tests now use ES6
2015-08-14 01:52:35 -07:00
af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
73d11fec27 Mocha tests now use ES6 2015-08-14 09:39:29 +02:00
99e7116ee5 make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
f3cef6de46 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
f1dd82974f finish QAing bootstrap 2015-08-13 20:58:27 -07:00
914d9c81b0 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
12f2aa9957 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
dc54e37df6 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
8cfdd4c742 add environmental vars to pm2start instead of hardcoding 2015-08-13 15:42:17 -07:00
146f42ef41 lint json 2015-08-13 15:42:17 -07:00
70d2810306 remove accordian 2015-08-13 15:41:30 -07:00
acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -07:00
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
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
2711664505 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
4cdd0e20d9 start adding json challenges 2015-08-13 12:55:50 -07:00
299405694b Add some code highlighting 2015-08-13 17:36:02 +01:00
c0140a9510 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
5905e19e1b Merge remote-tracking branch 'origin/OOPF' into OOPF 2015-08-13 12:57:14 +01:00
40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00
c50b9c5afa Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 00:57:42 -07:00
66bd9338ab remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
0262d1b676 fix github link
link callback uri should have some path as auth callback uri
2015-08-12 21:44:55 -07:00
bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
e76b5c8e7f remove codemirror docs from tracking 2015-08-12 21:01:07 -07:00
3196824b61 remove unnecessary codemirror modes 2015-08-12 20:49:44 -07:00
ac5f8b9d9a remove unneccassry demo dir from codemirror
closes #1730
2015-08-12 20:42:37 -07:00
7eaccffd15 remove hikes from map
closes #1682
2015-08-12 20:39:40 -07:00
cd9dcc6953 hide react routes 2015-08-12 20:32:27 -07:00
cc2e7a69f9 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
315b78fb69 update copy on onboarding 2015-08-12 20:27:46 -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
7910f0ae2c Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display 2015-08-13 01:20:12 +01:00
7ee6a8f888 Merge pull request #1741 from FreeCodeCamp/staging
Final update to OOPF before pr into staging
2015-08-13 00:24:41 +01:00
2b654ecd83 Removed the under construction flag 2015-08-13 00:21:52 +01:00
7c19d6c0ef First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01: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
d138757c52 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00