Commit Graph

17200 Commits

Author SHA1 Message Date
Berkeley Martinez
96df9bfcd7 Merge pull request #7904 from QuincyLarson/fix/social-buttons
fix button colors from issue #7903
2016-04-04 22:04:24 -07:00
Quincy Larson
a2466d77b3 fix button colors from issue #7903 2016-04-04 22:03:18 -07:00
Quincy Larson
8fb0516811 Merge pull request #7779 from FreeCodeCamp/fix/wiki-urls
Fix article loading on direct link to wiki
2016-04-04 21:09:21 -07:00
Alyssa Ingersoll
0ddca58a72 Changed basic javascript function names to be unique. 2016-04-04 20:02:31 -07:00
Alyssa Ingersoll
bfcdd79467 Changed basic javascript function names to be unique. 2016-04-04 20:02:31 -07:00
Eric Leung
232a3f91a4 Merge pull request #7688 from drk7891/fix/make-functions-unique
Fixed function names to make them unique
2016-04-04 16:10:05 -07:00
Eric Leung
34d362b3e8 Merge pull request #7688 from drk7891/fix/make-functions-unique
Fixed function names to make them unique
2016-04-04 16:10:05 -07:00
Berkeley Martinez
88edd2c64a Merge pull request #7878 from baguzzzaji/remove-jailed-and-all-references-to-it
Remove jailed and all references to it
2016-04-04 14:26:24 -07:00
Berkeley Martinez
823d55e653 Merge pull request #7894 from abisz/fix/change-position-of-french-translation
Fix position of french description of challenge
2016-04-04 14:22:32 -07:00
Berkeley Martinez
ab2df1a15a Merge pull request #7894 from abisz/fix/change-position-of-french-translation
Fix position of french description of challenge
2016-04-04 14:22:32 -07:00
Berkeley Martinez
5fcb6b999e Merge pull request #7895 from lipis/feature/update-bootstrap-social
Updated Bootstrap Social and remove plus from Google sign in icon
2016-04-04 14:19:11 -07:00
Berkeley Martinez
923d59d3e8 Merge pull request #7896 from lipis/fix/Github-to-GitHub
Renamed Github to GitHub
2016-04-04 14:10:20 -07:00
Panayiotis Lipiridis
8a73c900ed Renamed Github to GitHub 2016-04-04 22:50:07 +02:00
Panayiotis Lipiridis
c17af58aee Renamed Github to GitHub 2016-04-04 22:50:07 +02:00
Panayiotis Lipiridis
7c27952ff6 Updated Bootstrap Social
..and remove plus from Google sign in icon
2016-04-04 22:36:35 +02:00
Simon Reinsperger
851a63e703 Fix position of french description of challenge 2016-04-04 22:28:15 +02:00
Simon Reinsperger
45e534ec29 Fix position of french description of challenge 2016-04-04 22:28:15 +02:00
drk7891
af74d043cb Fixed function names to make them unique 2016-04-04 16:10:38 -04:00
drk7891
380dd756b2 Fixed function names to make them unique 2016-04-04 16:10:38 -04:00
Vladimir Támara Patiño
52e68d7c6a Merge pull request #7869 from abisz/add/DE-translation-GettingStarted
German Translation of Getting Started
2016-04-04 11:24:24 -05:00
Vladimir Támara Patiño
c3285ec266 Merge pull request #7869 from abisz/add/DE-translation-GettingStarted
German Translation of Getting Started
2016-04-04 11:24:24 -05:00
Simon Reinsperger
4286850133 German Translation of Getting Started
German Translation of Getting Started
2016-04-04 14:50:58 +02:00
Simon Reinsperger
085a32cc44 German Translation of Getting Started
German Translation of Getting Started
2016-04-04 14:50:58 +02:00
Bagus Aji Santoso
5bc2602bfd Remove jailed and all references to it 2016-04-04 13:13:06 +07:00
Mrugesh Mohapatra
d8c08d1d86 Merge pull request #7875 from erictleung/fix/typo-in-measuring-data-speed
Fix typo of bits to bytes in Measuring Data Speed
2016-04-04 09:19:02 +05:30
Eric Leung
915c16846a Fix typo of bits to bytes in Measuring Data Speed 2016-04-03 16:50:42 -07:00
Eric Leung
70a1e9cdfa Fix typo of bits to bytes in Measuring Data Speed 2016-04-03 16:50:42 -07:00
Rex Schrader
87ebb3517b Merge pull request #7856 from erictleung/fix/usability-on-local-scope-and-functions
Clarify instructions for Local Scope and Functions
2016-04-03 14:11:29 -07:00
Rex Schrader
41ce2d83f8 Merge pull request #7856 from erictleung/fix/usability-on-local-scope-and-functions
Clarify instructions for Local Scope and Functions
2016-04-03 14:11:29 -07:00
Mrugesh Mohapatra
3182d21b2a Merge pull request #7864 from clickthisnick/fix/remove-trailing-spaces
FIX - Remove trailing spaces
2016-04-03 23:00:22 +05:30
Mrugesh Mohapatra
a6a3c1ffcd Added Additional Test to Increment a Number
Added Additional Test to Increment a Number
2016-04-03 22:39:18 +05:30
Joseph Morse
5cbf53573a Added Additional Test to Increment a Number
Added an additional test to check that myVar = myVar is not still
present. Tested locally.
2016-04-03 11:52:02 -04:00
Joseph Morse
57e8d4abdf Added Additional Test to Increment a Number
Added an additional test to check that myVar = myVar is not still
present. Tested locally.
2016-04-03 11:52:02 -04:00
Eric Leung
0f5c329051 Simplify temp convert challenge
- Make grammar changes

- Add code tags to numbers

- Add note to calm students about foreign function and return statements

- Add spaces in seed code to align code with indents

- Remove unnecessary code from seed code
2016-04-03 17:41:40 +05:30
Eric Leung
69c8539679 Simplify temp convert challenge
- Make grammar changes

- Add code tags to numbers

- Add note to calm students about foreign function and return statements

- Add spaces in seed code to align code with indents

- Remove unnecessary code from seed code
2016-04-03 17:41:40 +05:30
Mrugesh Mohapatra
80373da417 Merge pull request #7855 from erictleung/fix/accept-different-returns-in-chain-if-else
Accept >=1 versus >=5 returns in chaining if else
2016-04-03 16:56:43 +05:30
Mrugesh Mohapatra
0fd376bc45 Merge pull request #7855 from erictleung/fix/accept-different-returns-in-chain-if-else
Accept >=1 versus >=5 returns in chaining if else
2016-04-03 16:56:43 +05:30
Eric Leung
094a48f0a9 Accept >=1 versus >=5 returns in chaining if else 2016-04-03 04:18:57 -07:00
Eric Leung
e25554f784 Accept >=1 versus >=5 returns in chaining if else 2016-04-03 04:18:57 -07:00
Mrugesh Mohapatra
b1ed06273b Merge pull request #7865 from karel1980/feature/typo-fix
Fix Typo in User.js that breaks Certificate Display
2016-04-03 16:17:28 +05:30
Vladimir Támara Patiño
8801623201 Merge pull request #7796 from erictleung/fix/make-a-person-instructions
Clarify Make a Person instructions & add ES trans
2016-04-03 05:40:22 -05:00
Vladimir Támara Patiño
1cf851c250 Merge pull request #7796 from erictleung/fix/make-a-person-instructions
Clarify Make a Person instructions & add ES trans
2016-04-03 05:40:22 -05:00
Karel Vervaeke
3a32650400 Display correct error message when visiting user front end certification page 2016-04-03 12:34:51 +02:00
Mrugesh Mohapatra
9d0976cb12 Merge pull request #7863 from jnmorse/fix/change_test_for_create_an_ordered_list
Changed Test for Create an Ordered List
2016-04-03 15:34:04 +05:30
Mrugesh Mohapatra
a9266e8361 Merge pull request #7863 from jnmorse/fix/change_test_for_create_an_ordered_list
Changed Test for Create an Ordered List
2016-04-03 15:34:04 +05:30
Nick
b049d252ef FIX - Remove trailing spaces 2016-04-02 23:52:52 -04:00
Joseph Morse
7bf41196af Changed Test for Create an Ordered List
I changed the first two test to check if the items proceeding the lists
have the expected text. This should handle testing if they exist as well
as in the right place.  Also changed the two following test to
implicitly check for 3 list items.
2016-04-02 20:46:54 -04:00
Joseph Morse
de8fd001b1 Changed Test for Create an Ordered List
I changed the first two test to check if the items proceeding the lists
have the expected text. This should handle testing if they exist as well
as in the right place.  Also changed the two following test to
implicitly check for 3 list items.
2016-04-02 20:46:54 -04:00
Berkeley Martinez
94fc1ed90e Merge pull request #7661 from N0bl3/translate/FR-Claim-Your-Back-End-Development-Certificate
translate\Translated Reclaim your back end development certificate in french
2016-04-02 08:07:56 -07:00
Berkeley Martinez
11df000bad Merge pull request #7661 from N0bl3/translate/FR-Claim-Your-Back-End-Development-Certificate
translate\Translated Reclaim your back end development certificate in french
2016-04-02 08:07:56 -07:00