Commit Graph

15660 Commits

Author SHA1 Message Date
a65742ad45 Fix wiki's SSL issue
fix wiki view

Fix to the same issue that was effecting the aside wiki
2016-03-17 18:14:26 +00:00
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
88e5792b4b Make Truncate a String function unique & clarify
- Change `truncate` function to `truncateString`
- Update challenge description to clarify goals of challenge
2016-03-17 05:46:07 -07:00
41cd3dae5f Make Truncate a String function unique & clarify
- Change `truncate` function to `truncateString`
- Update challenge description to clarify goals of challenge
2016-03-17 05:46:07 -07:00
f8bb686d12 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
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
972711653f Merge pull request #7582 from jacobbearden/fix/image-protocol
fix image protocol
2016-03-16 21:23:16 -07:00
6d1a4b2847 Merge pull request #7582 from jacobbearden/fix/image-protocol
fix image protocol
2016-03-16 21:23:16 -07:00
67999239ca 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
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
020632962b fix image protocol 2016-03-16 20:32:12 -06:00
fcf866906b fix image protocol 2016-03-16 20:32:12 -06:00
a6900214ae Translation of challenge console and logging in computer-basics
Update computer-basics.json
2016-03-16 21:18:51 +00:00
d02bc605a2 Translation of challenge console and logging in computer-basics
Update computer-basics.json
2016-03-16 21:18:51 +00:00
d244fe4024 Make Repeat a String function name unique 2016-03-16 14:17:27 -07:00
6d055723a8 Make Repeat a String function name unique 2016-03-16 14:17:27 -07:00
69daeea96a 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
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
e7efdbe561 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
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
3d8389b574 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
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
dc1ec8bbbf 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
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
a403854998 Merge pull request #7511 from SaintPeter/feature/add-exact-change-solution
Add solution to Exact Change
2016-03-16 18:10:48 +05:30
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
4b5c8b81a7 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
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
7ddeecdfb4 Fix links in video descriptions 2016-03-16 12:51:08 +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
20addf55e3 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
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
f8785a1905 Make Friendly Date Ranges function name unique 2016-03-15 01:05:16 -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
eecc8e4428 Updated example code fo r Accessing Nested Arrays in JSON 2016-03-14 22:50:24 -07:00