Commit Graph

5427 Commits

Author SHA1 Message Date
b63cc229a9 Merge remote-tracking branch 'upstream/staging' into patch-2 2015-08-30 13:01:51 +05:30
8392dcf156 Merge branch 'staging' into add-quotes 2015-08-29 22:32:44 -07:00
23c1e71823 update quotes 2015-08-29 22:31:46 -07:00
36d7e5ba88 Merge remote-tracking branch 'origin/staging' into staging 2015-08-30 00:31:25 +01:00
71b6e21e77 Added the accessibility fix and added the hack to fix the challenge complete modal 2015-08-30 00:31:07 +01:00
83ca697b2e Merge pull request #2862 from natac13/fix-typo-delete-jquery-functions-2832
Fix typo delete jquery functions 2832
2015-08-30 00:00:53 +01:00
28b63c824e fixed the typo of double 'your' words in Delete jQuery Functions. issue #2832 2015-08-29 18:57:52 -04:00
1dd3246f87 fixed loopback-boot to last safe version for our codebase
@berkeleytrue this should temp fix it until loopback etc can be safely bumped up to a newer version
2015-08-29 23:39:01 +01:00
20462582f4 fixed minor typo where there was a 's' left when the sentence was changed. Issue #2853 2015-08-29 18:30:16 -04:00
4361d6edee Another Small Calrification to bonfire desc 2015-08-29 23:26:49 +01:00
bdb498a7f5 Merge pull request #1 from FreeCodeCamp/staging
merging from FCC
2015-08-29 18:18:30 -04:00
465df6ca8c Merge pull request #1756 from abhisekp/patch-1
Add test cases for Bonfire: Where art thou
2015-08-29 22:46:26 +01:00
a06ad15435 Small clarification in a bonfire desc 2015-08-29 22:44:19 +01:00
e3e1f16195 Merge pull request #2820 from AEA2002/staging
Minor edit in Find the Nth Character
2015-08-29 19:25:29 +01:00
fc5316f545 Merge pull request #2821 from uwaseem/uwaseem-1979
Fixed typo for issue 1979
2015-08-29 19:23:46 +01:00
f1e4065ee6 Merge pull request #2825 from bugron/bugron-2293
fixes 'editor.getValue(...).match(...) is null'
2015-08-29 19:22:27 +01:00
0a58825c93 Merge pull request #2850 from awesomeaniruddh/awesomeaniruddh-2842
expanded description of 'Where art thou' bonfire
2015-08-29 19:05:00 +01:00
02ffd55348 expanded description of 'Where art thou' bonfire 2015-08-30 01:25:30 +08:00
bf6e8c1305 Merge pull request #2847 from FreeCodeCamp/fix/submit-button-copy
change Run code button to Run tests
2015-08-29 17:38:21 +01:00
702dbeceab change Run code button to Run tests
Changes run button copy

closes #2846
2015-08-29 09:30:47 -07:00
16b33ee90a fix some linting issues 2015-08-29 01:48:01 -07:00
f0b953eb66 fix typo js challenges view 2015-08-29 01:05:07 -07:00
717c56edb7 fix freecatphotoapp.com test 2015-08-28 17:52:02 -07:00
0dfa11ca99 remove all manifest files from tracking
add readme explaining empty directory
2015-08-28 16:39:14 -07:00
9b6a709301 fix pack-client should out to correct dir 2015-08-28 16:11:29 -07:00
6c48395868 separate main manifest generation from sub manifests
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
2015-08-28 15:56:58 -07:00
64b63d73db intermidiate save 2015-08-28 15:56:58 -07:00
96742c4f30 mid stage save 2015-08-28 15:56:58 -07:00
83724bef1d make thumbnails 100 x 100 2015-08-28 15:56:58 -07:00
bfd4980e5d rename show to list
fall inline with rest conventions
2015-08-28 15:56:58 -07:00
beab6a4472 fixes 'editor.getValue(...).match(...) is null' 2015-08-29 02:35:06 +04:00
eec0d073f1 Fixed typo for issue 1979 2015-08-29 04:08:48 +08:00
fb2cce826e Merge pull request #2801 from QuincyLarson/email-script
update email script to reflect loopback changes
2015-08-28 10:15:35 -07:00
f88cce8939 start modifying intermediate bonfires 2015-08-28 04:38:56 -07:00
5400dc8c3b Merge pull request #2790 from ahstro/ahstro-2784
return(foo) => return foo
2015-08-28 00:49:00 -07:00
6d6274a465 update get-emails script 2015-08-27 16:37:01 -07:00
33ed3ae8b0 return(foo) => return foo 2015-08-27 22:19:03 +02:00
376b58cc15 combine sandbox into commonFramework
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
551cb987dd call chai after load in plugin 2015-08-27 12:36:29 -07:00
8d369615f6 combines two tests in one 2015-08-27 23:19:09 +04:00
45c0c710e0 lint sandbox 2015-08-27 11:40:06 -07:00
ce364b472f lint plugin 2015-08-27 11:35:41 -07:00
ed9e89b51f super lint commonFramework 2015-08-27 11:23:17 -07:00
956808ecd7 make manifest modifying tasks linear
Fix for malformed manifest file
2015-08-27 10:22:27 -07:00
30b61dc06c Merge pull request #2774 from regonn/lack-of-semicolon
Fix lack of semicolon at seed/challenges/html5-and-css.json
2015-08-27 15:41:53 +01:00
a048049ca3 allow literally any whitespace fix #2769 2015-08-27 15:31:56 +01:00
ebd92743f1 fix lack of semicolon 2015-08-27 23:29:21 +09:00
384dec42ac mid finished linting commonFramework 2015-08-27 00:15:13 -07:00
8f54932cab fix refactor codemirror 2015-08-27 00:02:07 -07:00
a975c0d1f1 fix add watch for js/dependents 2015-08-27 00:01:50 -07:00