Commit Graph

15881 Commits

Author SHA1 Message Date
Abhisek Pattnaik
a0f700b7db Merge remote-tracking branch 'upstream/staging' into patch-3 2015-08-30 13:49:04 +05:30
Abhisek Pattnaik
c51cd4762b Replace expect with assert 2015-08-30 13:36:39 +05:30
Abhisek Pattnaik
7e495338c4 Replace expect with assert 2015-08-30 13:36:39 +05:30
Abhisek Pattnaik
9cb0e80b9d Merge remote-tracking branch 'upstream/staging' into patch-2 2015-08-30 13:01:51 +05:30
Abhisek Pattnaik
b63cc229a9 Merge remote-tracking branch 'upstream/staging' into patch-2 2015-08-30 13:01:51 +05:30
Quincy Larson
8392dcf156 Merge branch 'staging' into add-quotes 2015-08-29 22:32:44 -07:00
Quincy Larson
23c1e71823 update quotes 2015-08-29 22:31:46 -07:00
benmcmahon100
36d7e5ba88 Merge remote-tracking branch 'origin/staging' into staging 2015-08-30 00:31:25 +01:00
benmcmahon100
71b6e21e77 Added the accessibility fix and added the hack to fix the challenge complete modal 2015-08-30 00:31:07 +01:00
Ben McMahon
1be3ad369f 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
Ben McMahon
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
Natac13
7b8c047a46 fixed the typo of double 'your' words in Delete jQuery Functions. issue #2832 2015-08-29 18:57:52 -04:00
Natac13
28b63c824e fixed the typo of double 'your' words in Delete jQuery Functions. issue #2832 2015-08-29 18:57:52 -04:00
Ben McMahon
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
Natac13
3cd616e526 fixed minor typo where there was a 's' left when the sentence was changed. Issue #2853 2015-08-29 18:30:16 -04:00
Natac13
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
Ben McMahon
6bdb177c3b Another Small Calrification to bonfire desc 2015-08-29 23:26:49 +01:00
Ben McMahon
4361d6edee Another Small Calrification to bonfire desc 2015-08-29 23:26:49 +01:00
Sean Campbell
bdb498a7f5 Merge pull request #1 from FreeCodeCamp/staging
merging from FCC
2015-08-29 18:18:30 -04:00
Ben McMahon
e64ab91834 Merge pull request #1756 from abhisekp/patch-1
Add test cases for Bonfire: Where art thou
2015-08-29 22:46:26 +01:00
Ben McMahon
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
Ben McMahon
a9d93d1485 Small clarification in a bonfire desc 2015-08-29 22:44:19 +01:00
Ben McMahon
a06ad15435 Small clarification in a bonfire desc 2015-08-29 22:44:19 +01:00
Ben McMahon
e3e1f16195 Merge pull request #2820 from AEA2002/staging
Minor edit in Find the Nth Character
2015-08-29 19:25:29 +01:00
Ben McMahon
513e25b185 Merge pull request #2820 from AEA2002/staging
Minor edit in Find the Nth Character
2015-08-29 19:25:29 +01:00
Ben McMahon
fc5316f545 Merge pull request #2821 from uwaseem/uwaseem-1979
Fixed typo for issue 1979
2015-08-29 19:23:46 +01:00
Ben McMahon
9a29a28155 Merge pull request #2821 from uwaseem/uwaseem-1979
Fixed typo for issue 1979
2015-08-29 19:23:46 +01:00
Ben McMahon
f1e4065ee6 Merge pull request #2825 from bugron/bugron-2293
fixes 'editor.getValue(...).match(...) is null'
2015-08-29 19:22:27 +01:00
Ben McMahon
6c877f0aa9 Merge pull request #2825 from bugron/bugron-2293
fixes 'editor.getValue(...).match(...) is null'
2015-08-29 19:22:27 +01:00
Ben McMahon
0a58825c93 Merge pull request #2850 from awesomeaniruddh/awesomeaniruddh-2842
expanded description of 'Where art thou' bonfire
2015-08-29 19:05:00 +01:00
Ben McMahon
11f55c274e Merge pull request #2850 from awesomeaniruddh/awesomeaniruddh-2842
expanded description of 'Where art thou' bonfire
2015-08-29 19:05:00 +01:00
Aniruddh Agarwal
eb2250ea42 expanded description of 'Where art thou' bonfire 2015-08-30 01:25:30 +08:00
Aniruddh Agarwal
02ffd55348 expanded description of 'Where art thou' bonfire 2015-08-30 01:25:30 +08:00
Ben McMahon
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
Berkeley Martinez
702dbeceab change Run code button to Run tests
Changes run button copy

closes #2846
2015-08-29 09:30:47 -07:00
Berkeley Martinez
16b33ee90a fix some linting issues 2015-08-29 01:48:01 -07:00
Berkeley Martinez
f0b953eb66 fix typo js challenges view 2015-08-29 01:05:07 -07:00
Berkeley Martinez
e2313988ad fix freecatphotoapp.com test 2015-08-28 17:52:02 -07:00
Berkeley Martinez
717c56edb7 fix freecatphotoapp.com test 2015-08-28 17:52:02 -07:00
Berkeley Martinez
0dfa11ca99 remove all manifest files from tracking
add readme explaining empty directory
2015-08-28 16:39:14 -07:00
Berkeley Martinez
9b6a709301 fix pack-client should out to correct dir 2015-08-28 16:11:29 -07:00
Berkeley Martinez
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
Berkeley Martinez
64b63d73db intermidiate save 2015-08-28 15:56:58 -07:00
Berkeley Martinez
96742c4f30 mid stage save 2015-08-28 15:56:58 -07:00
Berkeley Martinez
83724bef1d make thumbnails 100 x 100 2015-08-28 15:56:58 -07:00
Berkeley Martinez
bfd4980e5d rename show to list
fall inline with rest conventions
2015-08-28 15:56:58 -07:00
bugron
beab6a4472 fixes 'editor.getValue(...).match(...) is null' 2015-08-29 02:35:06 +04:00
bugron
1ffaea093e fixes 'editor.getValue(...).match(...) is null' 2015-08-29 02:35:06 +04:00
waseem
eec0d073f1 Fixed typo for issue 1979 2015-08-29 04:08:48 +08:00
waseem
959645ab75 Fixed typo for issue 1979 2015-08-29 04:08:48 +08:00