From f0e6b56e6986f2426b8dcfd82ae1798f41a0ab03 Mon Sep 17 00:00:00 2001 From: Eric Douglas Date: Mon, 11 Sep 2017 08:09:36 -0300 Subject: [PATCH 1/8] Update cover --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7de044..4860a75 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Open Source Society University (OSSU)](http://i.imgur.com/Cxv8DM4.png) +![Open Source Society University (OSSU)](http://i.imgur.com/kYYCXtC.png)

Open Source Society University

From 402e0ab94c9bf8f0afcfa906737503c8604ca241 Mon Sep 17 00:00:00 2001 From: Eric Douglas Date: Mon, 11 Sep 2017 11:14:59 -0300 Subject: [PATCH 2/8] Update links to point to OSSU --- CHANGELOG.md | 2 +- CONTRIBUTING.md | 2 +- LICENSE | 2 +- PROJECTS.md | 2 +- README.md | 12 ++++++------ REQUIREMENTS.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33855be..1a674d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -240,7 +240,7 @@ Due to Coursera's platform changes, we had the following updates: - **Cryptography**: - Applied Cryptography -**ps**: These removed courses are now in the [extras](https://github.com/open-source-society/computer-science/tree/master/extras) section. +**ps**: These removed courses are now in the [extras](https://github.com/ossu/computer-science/tree/master/extras) section. ## [1.3.12] 2016-03-17 ### Added diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 622b53e..11b7909 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,4 +9,4 @@ the subreddit is recommended as there people may be able to give you suggested a 3. If you have *specific* and *substantive* criticisms of the curriculum, i.e. problems related to the progression/content of courses it would be appropriate to [open an issue](https://help.github.com/articles/creating-an-issue/) and give us your suggestions. 4. If you have *non-substantive* updates to make to the curriculum, such as a course's URL having been moved, spelling/syntax errors, etc., please send a [pull request](https://help.github.com/articles/using-pull-requests/) to fix any mistakes that you have found. 5. If you want to customize the curriculum for yourself, do of course [fork this project](https://help.github.com/articles/fork-a-repo/). -6. If you want to suggest a new resource, send a pull request adding such resource to the [extras](https://github.com/open-source-society/computer-science/tree/master/extras) section. \ No newline at end of file +6. If you want to suggest a new resource, send a pull request adding such resource to the [extras](https://github.com/ossu/computer-science/tree/master/extras) section. diff --git a/LICENSE b/LICENSE index 2b7761f..485e9c5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Open Source Society +Copyright (c) 2017 Open Source Society University Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/PROJECTS.md b/PROJECTS.md index bf6ca15..189482b 100644 --- a/PROJECTS.md +++ b/PROJECTS.md @@ -1,7 +1,7 @@ # Projects > Here, we are providing a list curated by the community of exercises and projects to practice and reinforce the skills we try to master. -Projects created by OSSU's students for each course of our [**Computer Science**](https://github.com/open-source-society/computer-science) curriculum. +Projects created by OSSU's students for each course of our [**Computer Science**](https://github.com/ossu/computer-science) curriculum. For more project ideas, check the [Mega Project List](https://github.com/karan/Projects). diff --git a/README.md b/README.md index 4860a75..240c336 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Awesome - + Open Source Society University - Computer Science

@@ -430,10 +430,10 @@ In some cases, it may not be permitted; do **not** violate your course's Honor Code! Put the OSSU-CS badge in the README of your repository! -[![Open Source Society University - Computer Science](https://img.shields.io/badge/OSSU-computer--science-blue.svg)](https://github.com/open-source-society/computer-science) +[![Open Source Society University - Computer Science](https://img.shields.io/badge/OSSU-computer--science-blue.svg)](https://github.com/ossu/computer-science) -- Markdown: `[![Open Source Society University - Computer Science](https://img.shields.io/badge/OSSU-computer--science-blue.svg)](https://github.com/open-source-society/computer-science)` -- HTML: `Open Source Society University - Computer Science` +- Markdown: `[![Open Source Society University - Computer Science](https://img.shields.io/badge/OSSU-computer--science-blue.svg)](https://github.com/ossu/computer-science)` +- HTML: `Open Source Society University - Computer Science` ### Evaluation @@ -495,7 +495,7 @@ These aren't the only specializations you can choose. Check the following websit - Subscribe to [/r/opensourcesociety](https://www.reddit.com/r/opensourcesociety/)! - Join us in our [group](https://groups.google.com/forum/#!forum/open-source-society-university)! -- You can also interact through [GitHub issues](https://github.com/open-source-society/computer-science/issues). +- You can also interact through [GitHub issues](https://github.com/ossu/computer-science/issues). - We also have a chat room! [![Join the chat at https://gitter.im/open-source-society/computer-science](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/open-source-society/computer-science?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) - Add **Open Source Society University** to your [Facebook](https://www.facebook.com/ossuniversity) profile! @@ -529,7 +529,7 @@ You can change the status of your board to be *public* or *private*. * **Curriculum Founder**: [Eric Douglas](https://github.com/ericdouglas) * **Curriculum Maintainer**: [Eric Douglas](https://github.com/ericdouglas) and [hanjiexi](https://github.com/hanjiexi) -* **Contributors**: [contributors](https://github.com/open-source-society/computer-science/graphs/contributors) +* **Contributors**: [contributors](https://github.com/ossu/computer-science/graphs/contributors) # References diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md index 7e03e9a..9805ede 100644 --- a/REQUIREMENTS.md +++ b/REQUIREMENTS.md @@ -1,4 +1,4 @@ -# OSSU Academic Requirements +# OSSU-CS Academic Requirements This document contains the subjects (e.g. programming), topics (e.g. imperative programming), and projects the student must master to pass through this curriculum. The subject requirements are based on topics, rather than specific courses, because sometimes a certain course isn't available at the right time or doesn't fit the student's learning style. @@ -71,4 +71,4 @@ For Core CS, students have two options: For the Advanced CS Project (also known as the Final Project), students again have two options: - They can take one of the Specializations under [Advanced applications](#advanced-applications), all of which include Capstone Projects. Students *must* share their project code unless the course's honor code forbids it. -- They can create their own Final Project, and must share the project code to be evaluated by the community. \ No newline at end of file +- They can create their own Final Project, and must share the project code to be evaluated by the community. From a2a7fb35210edc5f565757912e5fdb4d94fa5f54 Mon Sep 17 00:00:00 2001 From: Eric Douglas Date: Fri, 29 Sep 2017 06:10:07 -0300 Subject: [PATCH 3/8] Add patreon badge --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 240c336..ce46405 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

Open Source Society University

- Path to a self-taught education in Computer Science! + Path to a free self-taught education in Computer Science!

@@ -11,6 +11,9 @@ Open Source Society University - Computer Science + + Contribute with OSSU on Patreon +

# Contents From 590f9cdecac01b0713cf9994c44bcbeda74aa981 Mon Sep 17 00:00:00 2001 From: asdevgit <32041546+asdevgit@users.noreply.github.com> Date: Sun, 1 Oct 2017 01:21:26 +0100 Subject: [PATCH 4/8] Update CodeComplete book title Updated to show 2nd edition --- extras/readings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/readings.md b/extras/readings.md index 3b28aa8..e9c870b 100644 --- a/extras/readings.md +++ b/extras/readings.md @@ -19,7 +19,7 @@ Name | Author(s) [Design Patterns: Elements of Reusable Object-Oriented Software](https://www.amazon.com/Design-Patterns-Elements-Reusable-Object-Oriented/dp/0201633612) | Erich Gamma, Richard Helm, Ralph Johnson, John Vlissides [Refactoring](https://www.refactoring.com/) | Martin Fowler [Clean Code](https://www.amazon.com/Clean-Code-Handbook-Software-Craftsmanship/dp/0132350882) | Robert Martin -[Code Complete](https://www.amazon.com/Code-Complete-Practical-Handbook-Construction/dp/0735619670) | Steve McConnell +[Code Complete 2e](https://www.amazon.com/Code-Complete-Practical-Handbook-Construction/dp/0735619670) | Steve McConnell [The Pragmatic Programmer](https://www.amazon.com/Pragmatic-Programmer-Journeyman-Master/dp/020161622X) | Andrew Hunt, David Thomas ## Math From 52c8c9c4ee79a63e983425a9e5138aa4c0a10241 Mon Sep 17 00:00:00 2001 From: Eric Douglas Date: Mon, 2 Oct 2017 19:47:32 -0300 Subject: [PATCH 5/8] Add link to newsletter --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ce46405..2bec3b5 100644 --- a/README.md +++ b/README.md @@ -496,6 +496,7 @@ These aren't the only specializations you can choose. Check the following websit # Community +- Subscribe to our [newsletter](https://tinyletter.com/ossu) - Subscribe to [/r/opensourcesociety](https://www.reddit.com/r/opensourcesociety/)! - Join us in our [group](https://groups.google.com/forum/#!forum/open-source-society-university)! - You can also interact through [GitHub issues](https://github.com/ossu/computer-science/issues). From ae03d5abb75fd6c130791ac66cfe221cda72f1fd Mon Sep 17 00:00:00 2001 From: Eric Douglas Date: Tue, 10 Oct 2017 11:39:18 -0300 Subject: [PATCH 6/8] Add new forum and code of conduct (#427) * Add new forum and code of conduct * Undo changes on headings --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2bec3b5..69b431a 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ - [Advanced CS](#advanced-cs) - [Final project](#final-project) - [Pro CS](#pro-cs) +- [Code of conduct](#code-of-conduct) - [Community](#community) - [How to show your progress](#how-to-show-your-progress) - [Team](#team) @@ -494,17 +495,19 @@ These aren't the only specializations you can choose. Check the following websit ![keep learning](http://i.imgur.com/REQK0VU.jpg) +# Code of conduct +[OSSU's code of conduct](https://github.com/ossu/code-of-conduct). + # Community - Subscribe to our [newsletter](https://tinyletter.com/ossu) -- Subscribe to [/r/opensourcesociety](https://www.reddit.com/r/opensourcesociety/)! -- Join us in our [group](https://groups.google.com/forum/#!forum/open-source-society-university)! +- Use our [forum](https://github.com/ossu/forum) if you need some help. - You can also interact through [GitHub issues](https://github.com/ossu/computer-science/issues). - We also have a chat room! [![Join the chat at https://gitter.im/open-source-society/computer-science](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/open-source-society/computer-science?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) -- Add **Open Source Society University** to your [Facebook](https://www.facebook.com/ossuniversity) profile! +- Add **Open Source Society University** to your [Linkedin](https://www.linkedin.com/school/11272443/) and [Facebook](https://www.facebook.com/ossuniversity) profile! > **PS**: A forum is an ideal way to interact with other students as we do not lose important discussions, which usually occur in communication via chat apps. -**Please use our subreddit/group for important discussions**. +**Please use our forum for important discussions**. ## How to show your progress @@ -531,8 +534,8 @@ You can change the status of your board to be *public* or *private*. ## Team -* **Curriculum Founder**: [Eric Douglas](https://github.com/ericdouglas) -* **Curriculum Maintainer**: [Eric Douglas](https://github.com/ericdouglas) and [hanjiexi](https://github.com/hanjiexi) +* **Curriculum Founders**: [Eric Douglas](https://github.com/ericdouglas) +* **Curriculum Maintainers**: [Eric Douglas](https://github.com/ericdouglas) and [hanjiexi](https://github.com/hanjiexi) * **Contributors**: [contributors](https://github.com/ossu/computer-science/graphs/contributors) # References From 5947486570a830e13a3d25f7734c8f847f32e194 Mon Sep 17 00:00:00 2001 From: Victor Ferreira Date: Tue, 31 Oct 2017 23:06:15 -0300 Subject: [PATCH 7/8] Fix grammatical inconsistencies in README.md (#432) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 69b431a..a9d68c8 100644 --- a/README.md +++ b/README.md @@ -491,7 +491,7 @@ These aren't the only specializations you can choose. Check the following websit - Pay attention to emerging technologies in the world of software development: + Explore the **actor model** through [Elixir](http://elixir-lang.org/), a new functional programming language for the web based on the battle-tested Erlang Virtual Machine! + Explore **borrowing and lifetimes** through [Rust](https://www.rust-lang.org/), a systems language which achieves memory- and thread-safety without a garbage collector! - + Explore **dependent type systems** through [Idris](https://www.idris-lang.org/), a new Haskell-inspired language with unprecedented support for type-driven development + + Explore **dependent type systems** through [Idris](https://www.idris-lang.org/), a new Haskell-inspired language with unprecedented support for type-driven development. ![keep learning](http://i.imgur.com/REQK0VU.jpg) @@ -500,7 +500,7 @@ These aren't the only specializations you can choose. Check the following websit # Community -- Subscribe to our [newsletter](https://tinyletter.com/ossu) +- Subscribe to our [newsletter](https://tinyletter.com/ossu). - Use our [forum](https://github.com/ossu/forum) if you need some help. - You can also interact through [GitHub issues](https://github.com/ossu/computer-science/issues). - We also have a chat room! [![Join the chat at https://gitter.im/open-source-society/computer-science](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/open-source-society/computer-science?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) From 627058f2264c29a8a35733b66d0f97584204455e Mon Sep 17 00:00:00 2001 From: Waciuma Wanjohi Date: Wed, 1 Nov 2017 20:28:38 -0400 Subject: [PATCH 8/8] Move Hack-the-Kernel from advanced systems to core systems and change Three Easy Pieces from Required to Recommended --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0bf656e..74e7539 100644 --- a/README.md +++ b/README.md @@ -223,9 +223,10 @@ Courses | Duration | Effort | Prerequisites [Build a Modern Computer from First Principles: From Nand to Tetris](https://www.coursera.org/learn/build-a-computer) ([alt](http://www.nand2tetris.org/)) | 6 weeks | 7-13 hours/week | none [Build a Modern Computer from First Principles: Nand to Tetris Part II ](https://www.coursera.org/learn/nand2tetris2) | 6 weeks | 12-18 hours/week | From Nand to Tetris Part I [Introduction to Computer Networking](https://lagunita.stanford.edu/courses/Engineering/Networking-SP/SelfPaced/about)| 8 weeks | 4–12 hours/week | algebra, probability, basic CS +[ops-class.org - Hack the Kernel](https://www.ops-class.org/) | 15 weeks | 6 hours/week | algorithms #### Readings -- **Required** since Nand2Tetris does not go deep enough into operating systems: [Operating Systems: Three Easy Pieces](http://pages.cs.wisc.edu/~remzi/OSTEP/) +- **Recommended**: While Hack the Kernel recommends Modern Operating Systems as a textbook, we suggest using [Operating Systems: Three Easy Pieces](http://pages.cs.wisc.edu/~remzi/OSTEP/). ### Core theory @@ -359,7 +360,6 @@ Courses | Duration | Effort | Prerequisites [Computation Structures 1: Digital Circuits](https://www.edx.org/course/computation-structures-part-1-digital-mitx-6-004-1x-0) | 10 weeks | 6 hours/week | electricity, magnetism [Computation Structures 2: Computer Architecture](https://www.edx.org/course/computation-structures-2-computer-mitx-6-004-2x) | 10 weeks | 6 hours/week | Computation Structures 1 [Computation Structures 3: Computer Organization](https://www.edx.org/course/computation-structures-3-computer-mitx-6-004-3x-0) | 10 weeks | 6 hours/week | Computation Structures 2 -[ops-class.org - Hack the Kernel](https://www.ops-class.org/) | 15 weeks | 6 hours/week | algorithms **1 Note**: These courses assume knowledge of basic physics.