Commit Graph

7950 Commits

Author SHA1 Message Date
f88a80c6cb Merge pull request #7601 from FreeCodeCamp/fix/settings-title
Added title to settings page
2016-03-17 10:55:30 -07:00
fef1653542 added title to settings page 2016-03-17 17:39:44 +00:00
ab5b1451e4 Merge pull request #7571 from alistermada/fix/links-in-video-descriptions
Fix links in video challenge descriptions
2016-03-17 18:03:15 +05:30
22744fcbdf Merge pull request #7585 from hallaathrad/fix/drawer-issues
Fix map overlapping issues
2016-03-17 17:37:34 +05:30
1533be6265 Merge pull request #7568 from Kalcode/fix/currentChallenge-redirect-cookie-expire
changed expire time for currentChallengeId cookie to 'never'
2016-03-16 22:56:47 -07:00
6d1a4b2847 Merge pull request #7582 from jacobbearden/fix/image-protocol
fix image protocol
2016-03-16 21:23:16 -07:00
6cc56e4a6c Merge pull request #7332 from BlancaInesAcosta/fix/ES-computer-basics
Translation of challenge console and logging in  computer-basics
2016-03-16 23:08:56 -05:00
bcfe8b99a7 Fix map overlapping issues 2016-03-16 23:13:08 -04:00
fcf866906b fix image protocol 2016-03-16 20:32:12 -06:00
d02bc605a2 Translation of challenge console and logging in computer-basics
Update computer-basics.json
2016-03-16 21:18:51 +00:00
88c917c639 Merge pull request #7536 from erictleung/fix/unique-function-name-for-inventory-update
Make Inventory Update function name unique
2016-03-16 13:21:08 -07:00
5d4138a495 Make Inventory Update function name unique
- Change `inventory` function name to `updateInventory` in seeded code,
  solution, and tests
- Update instructions to be more clear
2016-03-16 13:14:34 -07:00
5c16a3aeb5 Merge pull request #7561 from erictleung/fix/unique-function-name-for-friendly-dates
Make Friendly Date Ranges function name unique
2016-03-16 13:08:48 -07:00
97a0f71388 Merge pull request #7158 from QuincyLarson/feature/add-nonprofit-project-description
Add an explanation of how our nonprofit projects work
2016-03-16 12:57:23 -07:00
34dffa3421 Merge pull request #7573 from erictleung/fix/unique-function-name-for-confirm-the-ending
Make Confirm the Ending function name unique
2016-03-16 12:53:36 -07:00
1feb43edad Merge pull request #7511 from SaintPeter/feature/add-exact-change-solution
Add solution to Exact Change
2016-03-16 18:10:48 +05:30
69ee345d5c incorporate feedback 2016-03-16 00:27:19 -07:00
e9683bb318 Make Confirm the Ending function name unique
- Change `end` function name to `confirmEnding`
- Add clarity on arguments used in function
2016-03-15 23:54:56 -07:00
c13e234ff7 Fix links in video descriptions 2016-03-16 12:51:08 +07:00
9d5a5d953c changed expire time for currentChallengeId cookie to 'never' instead of session 2016-03-15 14:53:54 -05:00
5df5658a5e Merge pull request #7505 from SaintPeter/fix/change-nameLN-to-titleLN
Change nameXX properties to titleXX properties
2016-03-15 11:34:32 -07:00
8154eb78c0 Merge pull request #7564 from QuincyLarson/feature/settings-page
Create settings page with email settings
2016-03-15 11:33:56 -07:00
ee6ca2c5ae address eslint errors from refactor 2016-03-15 11:22:54 -07:00
fa18f967d9 Make Friendly Date Ranges function name unique 2016-03-15 01:05:16 -07:00
891c0c2e5a remove trailing whitespace 2016-03-15 00:00:53 -07:00
cdc44e4b7e update unsubscribe paths 2016-03-14 23:59:25 -07:00
71b213d7d4 make notification text more friendly 2016-03-14 23:59:25 -07:00
f16234d9c6 refactor make account private action to use updateAttribute instead of save 2016-03-14 23:59:25 -07:00
2285d18260 refactor show view to have a settings button 2016-03-14 23:59:25 -07:00
d47aed4850 factor out settings page with email settings 2016-03-14 23:59:24 -07:00
8e621fd0cb Merge pull request #7533 from ahstro/fix/hikes-question-flash
Don't flash next question before video in hikes
2016-03-14 21:37:39 -07:00
296536fd81 Merge pull request #7516 from FreeCodeCamp/fix/update-faq
Update Campsite challenge copy and labs
2016-03-14 21:15:11 -07:00
cb043b0d9c Merge pull request #7542 from FreeCodeCamp/fix/coerce-before-validator
Coerce values to string before using validator methods
2016-03-14 00:31:07 -07:00
e657b96dbc Coerce values to string before using validator methods 2016-03-13 18:09:53 -07:00
cf4b862c4c Merge pull request #7396 from jnmorse/enhancement/suggest_prefix_localStorage
Added Prefix Hint to React Recipe Box
2016-03-13 17:17:33 -07:00
dbe8a1014c Merge pull request #7424 from alistermada/fix/twitch-link-redirect
Redirect /twitch to Twitch channel
2016-03-13 17:15:55 -07:00
28a52f517d Don't flash next question before video in hikes 2016-03-13 17:00:25 +01:00
56d4ee808d Merge pull request #7523 from hallaathrad/fix/drawer-issues
Fix for overlapping chapter titles
2016-03-13 00:48:35 +05:30
1efdfab0b9 Change margin and width for nested elements in map 2016-03-12 13:51:37 -05:00
4ba1cb6317 Update campsite challenge copy 2016-03-11 23:57:43 -08:00
9e93d580f6 Update the FAQ 2016-03-11 23:16:06 -08:00
7f85f84e47 Update labs view and add a new project 2016-03-11 23:14:21 -08:00
9f328fbaa3 Merge pull request #7501 from EMChamp/fix/index-typo2
Fixed variable name typo.
2016-03-11 22:18:13 -08:00
6e7d5db741 Change nameXX properties to title XX properties 2016-03-11 21:00:06 -08:00
9d0cadb723 Add solution to Exact Change 2016-03-11 20:35:55 -08:00
59dc9c6ca3 Merge pull request #7299 from erictleung/fix/unique-function-name-for-exact-change
Make Exact Change function name unique & lint
2016-03-11 20:07:21 -08:00
d2af0c6a03 Fixed DOMContainer typo. 2016-03-11 10:25:59 -08:00
3997da2dcd Make Exact Change function name unique & lint
- Change `drawer` function to `checkCashRegister`
- Add code tags around subjectively needed text
2016-03-10 21:01:05 -08:00
d18fc2b4c7 Merge pull request #7485 from erictleung/fix/format-javascript-challenge-title
Fix javascript to JavaScript in Basic JavaScript
2016-03-10 22:06:43 +11:00
bcbd863b9a Fix javascript to JavaScript in Basic JavaScript 2016-03-10 00:09:18 -08:00