Commit Graph

7845 Commits

Author SHA1 Message Date
a4dd9667ca Fix typos 2016-02-10 10:09:40 -08:00
dc27f53ecb Commit uses challengeMap 2016-02-10 10:09:40 -08:00
76cfbdf752 challenge/user router now works with challengeMap 2016-02-10 10:09:40 -08:00
07d54a455c Add challengeMap migrations 2016-02-10 10:06:36 -08:00
9913d8de92 Merge pull request #6637 from FreeCodeCamp/greenkeeper-cheerio-0.20.0
Update cheerio to version 0.20.0 🚀
2016-02-10 09:42:04 -08:00
723411dbf5 Merge pull request #6620 from FreeCodeCamp/greenkeeper-react-motion-0.4.2
Update react-motion to version 0.4.2 🚀
2016-02-10 09:28:52 -08:00
b715cb4abc Update react-motion spring argument signature 2016-02-10 09:19:51 -08:00
2594acb959 Merge pull request #6098 from FreeCodeCamp/greenkeeper-loopback-component-passport-2.0.0
Update loopback-component-passport to version 2.0.0 🚀
2016-02-10 09:02:23 -08:00
c7b1ca20e8 Merge pull request #6809 from rfprod/add/RU-translation-react-projects
Russian Translation of React Projects.
2016-02-10 16:48:37 +04:00
V
26dd3d9f25 Russian Translation of React Projects. Closes #6808
Russian Translation of React Projects. Edited some typos. Closes #6808

Russian Translation of React Projects. Final edits.
2016-02-10 11:26:27 +00:00
b78c24355f chore(package): update gulp-rev to version 7.0.0
http://greenkeeper.io/
2016-02-10 02:00:20 -08:00
812b50ebe1 Merge pull request #6803 from MatheusGodinho/add/PT-translation-json0apis-and-ajax
Challenges of Json APIS and Ajax translated.
2016-02-09 20:48:44 -08:00
df32d1e96e Merge pull request #6822 from pasosdeJesus/fix/ES-update-basic-bonfires
Verify and update translation to spanish of basic-bonfires
2016-02-09 20:47:02 -08:00
dd77f69ecb Merge pull request #6861 from hallaathrad/feature/wiki-sidebar
adding wiki as detached and integrating into .less folder
2016-02-09 20:35:13 -08:00
969c3f1fd4 Merge pull request #6858 from LenaBarinova/fix/green_checkmarks_missing_in_project_view
Green checkmarks added to Video and Zipline challenges view
2016-02-09 20:29:55 -08:00
fe422d2300 adding wiki as detached and integrating into .less folder 2016-02-09 23:26:59 -05:00
3c7f6c2ef5 Merge pull request #6351 from FreeCodeCamp/greenkeeper-dotenv-2.0.0
Update dotenv to version 2.0.0 🚀
2016-02-09 19:28:28 -08:00
690dedda29 Merge pull request #6856 from alistermada/fix/test-iterate-through-array
Fix test for Iterate Through An Array With For Loop
2016-02-09 16:31:24 -08:00
28df95b25c Green checkmarks added to Video and Zipline challenges view for completed challenges 2016-02-09 16:20:30 -08:00
4afea48ffd Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2016-02-09 15:50:04 -08:00
ee95c9ac94 Merge branch 'Apercu-fix/imperative-wording' into staging 2016-02-09 15:49:42 -08:00
5cc967f21d update copy and resolve merge conflict 2016-02-09 15:49:35 -08:00
b5e8f84dae Fix test for Iterate Through An Array With For Loop 2016-02-10 06:29:11 +07:00
671384fea0 Merge pull request #6850 from LenaBarinova/fix/streak-broken-though-challenges-completed-everyday
Fix steak calculation to not break when challenges are completed everyday
2016-02-09 14:24:52 -08:00
631c7ea319 Timestamps are converted to start of the days and filtered to b unique before calculating streaks 2016-02-09 13:48:20 -08:00
02662e98e2 Add Wiki Sidebar 2016-02-09 12:44:08 -08:00
975873e42e Merge pull request #6851 from raisedadead/fix/create-a-custom-heading
Fix text of the challenge with better wording
2016-02-09 11:52:42 -08:00
f575222ac6 Fix text of the challenge with better wording
This commit changes the into text of the challenge with better wording,
as discussed in the issue thread.

Tested locally.
2016-02-09 23:56:19 +05:30
d218346ed1 Merge pull request #6843 from erictleung/fix/clarify-symmetric-difference
Clarify symmetric difference definition + examples
2016-02-09 09:12:27 -08:00
2aebcab273 Clarify symmetric difference definition + examples
- Make definition of symmetric difference more precise
- Add in set examples in description to facilitate learning of the
  concept
- Put "symmetric difference" in `<dfn>` tags
2016-02-08 22:56:41 -08:00
2d33525d43 Merge pull request #6841 from erictleung/fix/clarify-diff-two-arrays-instruction
Clarify diff two arrays instructions
2016-02-08 22:21:59 -08:00
fe7e7c27be Clarify diff two arrays instructions
- Clarify you want items that are in one but not both arrays
- Add "symmetric difference" terminology for those familiar with it
2016-02-08 21:22:37 -08:00
7b1cb3202c Update translation to spanish of basic-bonfires
Closes #6495
Thanks for corrections to @justinian336 and @Narshe1412
2016-02-08 20:44:41 -05:00
4c8f6c1f89 Merge pull request #6801 from alistermada/fix/map-button-on-active-map
Map and chat buttons close their respective asides when open
2016-02-08 15:35:08 -08:00
487e0e85fc Merge pull request #6798 from erictleung/fix/permutation-problem-explanation
Clarify characters are each unique in permutation
2016-02-08 13:26:26 -08:00
0465923e64 Map and chat buttons toggle asides 2016-02-08 10:05:02 +07:00
3dcc67599a Merge pull request #6814 from hallaathrad/fix/navbar-issue-4digit-brownies
fix for navbar overflowing at 4 digits brownies
2016-02-07 11:28:21 -08:00
85a78046d1 fix for navbar overflowing at 4 digits brownies 2016-02-07 14:02:45 -05:00
f1e7ff8886 Merge pull request #6804 from hallaathrad/fix/react-navbar-shop
Add shop to the react navbar
2016-02-07 10:49:19 -08:00
cedc6ff1cb Verified and updated translation to spanish of advanced-bonfires.
Closes #6494
Thanks for corrections to @justinian336
2016-02-07 12:32:14 -05:00
a1963e7d68 Add shop to the react navbar
Closes #6802
2016-02-07 08:16:50 -05:00
661ab041c5 Challenges of Json APIS and Ajax translated. Closes #6717 2016-02-07 11:07:52 -02:00
abaeda0272 Clarify characters are each unique in permutation 2016-02-07 00:00:39 -08:00
5571c668d2 Merge pull request #6796 from FreeCodeCamp/fix/production-timeout
Increase time for DB connect in production
2016-02-06 23:03:58 -08:00
60664abb1d Merge pull request #6795 from QuincyLarson/fix/add-euro-tshirt-link
add link to euro tshirt campaign
2016-02-06 23:01:57 -08:00
8247cac222 Merge pull request #6778 from alistermada/fix/challenge-text-alignment
Change slide challenge text-align to left
2016-02-06 23:01:27 -08:00
877c69255b Increase time for DB connect in production 2016-02-06 22:58:41 -08:00
25a762f52c add link to euro tshirt campaign 2016-02-06 22:55:58 -08:00
5b73279212 Remove slide challenge text-align center 2016-02-07 13:00:33 +07:00
1d624e4ed0 Merge pull request #6785 from joshuahenson/fix/clarify-nest-one-array
Clarify "Nest one Array..." challenge to include multiple arrays
2016-02-06 18:53:59 -08:00