summaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeLines
* Resolve merge conflict with masterCameron Schermerhorn2015-10-09-1/+1
| | | + added name back to contributor list
* Merge remote-tracking branch 'refs/remotes/adambard/master'Cameron Schermerhorn2015-10-09-839/+1063
|\ | | | | | | | | Conflicts: java.html.markdown
| * Merge pull request #1419 from vojtasvoboda/feature/json-typo-2Levi Bostian2015-10-09-1/+1
| |\ | | | | | | [json/en] Typo
| | * [json/en] TypoVojta Svoboda2015-10-09-1/+1
| | |
| * | Merge pull request #1413 from hfenton/masterLevi Bostian2015-10-09-0/+2
| |\ \ | | | | | | | | [en/git] Add Git Immersion tutorial as a resource
| | * | Git: Add Git Immersion tutorial as a resourceHeather Fenton2015-10-08-0/+2
| | | |
| * | | Merge pull request #1410 from voltnor/matlab_class_exampleLevi Bostian2015-10-09-0/+54
| |\ \ \ | | | | | | | | | | [matlab/en] Added simple class example to Matlab
| | * | | [matlab/en] Added simple class example to MatlabColton Kohnke2015-10-08-0/+54
| | | | |
| * | | | Merge pull request #1404 from tecknicaltom/masterLevi Bostian2015-10-09-1/+1
| |\ \ \ \ | | | | | | | | | | | | [perl6] fix the output of ff example
| | * | | | fix the output of ff exampleTom Samstag2015-10-08-1/+1
| | |/ / /
| * | | | Merge pull request #1381 from cwalk/swift-2Levi Bostian2015-10-09-4/+12
| |\ \ \ \ | | | | | | | | | | | | [swift/en] Added clearer description of Optionals and Unwrapping.
| | * | | | Suggested changesClayton Walker2015-10-08-5/+5
| | | | | |
| | * | | | Added clearer description of Optionals and Unwrapping. Minor typo changes as ↵Clayton Walker2015-10-06-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | well.
| | * | | | Forgot to add myself as a contributor from swift-1 pull request.Clayton Walker2015-10-06-0/+1
| | | | | |
| * | | | | Merge pull request #1382 from cwalk/goLevi Bostian2015-10-09-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | [go/en] Minor typos/Increased readability/Added link to official docs
| | * | | | | Added suggested changesClayton Walker2015-10-08-2/+2
| | | | | | |
| | * | | | | Added more to further readingClayton Walker2015-10-07-0/+2
| | | | | | |
| | * | | | | Minor Typos, increased readabilityClayton Walker2015-10-06-3/+4
| | |/ / / /
| * | | | | Merge pull request #1385 from gayanhewa/masterLevi Bostian2015-10-09-1/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | [php/en] Adding error handling
| | * | | | | Update php.html.markdownGayan2015-10-07-0/+5
| | | | | | |
| | * | | | | Update php.html.markdownGayan2015-10-07-2/+2
| | | | | | |
| | * | | | | Adding exceptions and error handlingGayan2015-10-07-2/+32
| | | | | | |
| * | | | | | Merge pull request #1305 from kdelwat/masterLevi Bostian2015-10-09-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [python3/en] Added examples of multiple parameters to higher order functions
| | * | | | | | Add examples of higher-order functions taking multiple argumentsCadel Watson2015-10-07-0/+6
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #1376 from kalebdavis/masterLevi Bostian2015-10-09-15/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix indentation to make compiled JS more readable
| | * | | | | | Fix indentation to make compiled JS more readableKaleb Davis2015-10-06-15/+15
| | |/ / / / /
| * | | | | | Merge pull request #1375 from kalebdavis/patch-3Levi Bostian2015-10-09-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add examples to show how printing works
| | * | | | | | Add examples to show how printing worksKaleb Davis2015-10-06-0/+4
| | |/ / / / /
| * | | | | | Merge pull request #1374 from kalebdavis/patch-2Levi Bostian2015-10-09-0/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add information about mapping arrays
| | * | | | | | Add information about mapping arraysKaleb Davis2015-10-06-0/+13
| | |/ / / / /
| * | | | | | Merge pull request #1373 from kalebdavis/patch-1Levi Bostian2015-10-09-1/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update ruby.html.markdown
| | * | | | | | Update ruby.html.markdownKaleb Davis2015-10-06-1/+7
| | |/ / / / /
| * | | | | | Merge pull request #1372 from raphaelbn/patch-1Levi Bostian2015-10-09-0/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [javascript/en] Added for/in loop JavaScript
| | * | | | | | Added for/in loop JavaScriptRaphael Nascimento2015-10-08-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixing code style
| | * | | | | | [javascript/en] Added for/in loop JavaScriptRaphael Nascimento2015-10-06-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | more explanation about for/in java script.
| | * | | | | | Update javascript.html.markdownRaphael Nascimento2015-10-06-0/+7
| | |/ / / / / | | | | | | | | | | | | | | For/In loop JavaScript
| * | | | | | Merge pull request #1371 from zfergus2/masterLevi Bostian2015-10-09-78/+131
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [java/en] Added additional definitions and edited comments
| | * | | | | | [java/en] Fixed repitionsZachary Ferguson2015-10-08-57/+2
| | | | | | | |
| | * | | | | | Revert "[c/en] Added a section for header files."Zachary Ferguson2015-10-07-49/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1ac6209a8d3f43e7a018d79454fb1095b3314c0.
| | * | | | | | Merge remote-tracking branch 'adambard/master'Zachary Ferguson2015-10-07-682/+747
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: java.html.markdown
| | * | | | | | [c/en] Added a section for header files.Zachary Ferguson2015-10-07-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a section for header files. Included a discussion of what belongs in a header file and what does not.
| | * | | | | | [java/en] Fixed WhitespaceZachary Ferguson2015-10-06-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converted tabs to 4 spaces for consistency.
| | * | | | | | [java/en] Final MethodsZachary Ferguson2015-10-06-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explained Final Methods
| | * | | | | | [java/en] removed excess abstract classZachary Ferguson2015-10-06-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed excess abstract class
| | * | | | | | [java/en] Merged definitions of abstract and added finalZachary Ferguson2015-10-06-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged definitions of abstract and added a definition of final classes.
| | * | | | | | Merge remote-tracking branch 'adambard/master'Zachary Ferguson2015-10-06-1/+694
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'adambard/master'Zachary Ferguson2015-10-06-327/+3192
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: java.html.markdown
| | * | | | | | | [java/en] Edits and additionsZachary Ferguson2015-10-06-19/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included an example of printf Discussed final variable initialization Gave a floating point division example Discussed boolean operators Defined the abstract and final class and compared them. Added some clarifying remarks to comments.
| * | | | | | | | Merge pull request #1403 from payet-s/fix-yaml-fr-typosven2015-10-09-44/+48
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | [yaml/fr] Fix typos
| | * | | | | | | [yaml/fr] Fix typospayet-s2015-10-09-44/+48
| | | |_|_|/ / / | | |/| | | | |