Commit Graph

653 Commits

Author SHA1 Message Date
Eric Douglas
b47e6223ad Merge pull request #177 from iTech-/master
Minor changes (new info + links + typo + references + duration/effort)
2015-10-20 14:49:26 -02:00
Napnac
c5b71a3366 Added contributing info and links 2015-10-19 18:56:40 +02:00
Napnac
531b85ed3a Added link + Fixed typo 2015-10-19 18:50:44 +02:00
Napnac
9c41f4d197 Added some new duration/effort + Added new references 2015-10-19 18:45:53 +02:00
Eric Douglas
fd01209bb6 Merge branch 'master' of github.com:open-source-society/computer-science
Conflicts:
	README.md
2015-10-19 13:42:07 -02:00
Eric Douglas
3a939402b9 Add Badge/Link to the Awesome list 2015-10-19 13:38:53 -02:00
Eric Douglas
db0350ed04 Merge pull request #172 from lukecaputo/patch-1
Link word "Introduction"
2015-10-16 17:46:01 -03:00
Eric Douglas
7c745f2208 Merge pull request #173 from lukecaputo/patch-2
Bump to 1.2.5
2015-10-16 17:45:38 -03:00
L. Caputo
1d8c754ef4 Bump to 1.2.5
Fix name of the section and add a hyperlink to it.
2015-10-16 16:41:13 -04:00
L. Caputo
c8218cd884 Update link, bump version
Change to version 1.2.5. Change referenced link title to match the title of the section ("Introduction to Computer Science").
2015-10-16 16:39:25 -04:00
L. Caputo
01689cd3d7 Link word "Introduction"
Link the word "Introduction" to the section that is being referenced.
2015-10-16 09:46:28 -04:00
Eric Douglas
141209aafa Remove citation about public commitment
ref #152
2015-10-14 17:49:47 -03:00
Michaël Seyne
55b057580a Merge remote-tracking branch 'refs/remotes/open-source-society/master' 2015-10-13 19:10:08 +02:00
Eric Douglas
496fdddae1 Merge pull request #147 from wuodland/patch-1
updated the pre-requisite para for more clarity
2015-10-13 07:27:29 -03:00
Eric Douglas
b4e61739a9 Merge pull request #150 from wuodland/patch-2
updated changelog
2015-10-13 07:26:46 -03:00
Karan Raj Baruah
0895d773a8 updated changelog 2015-10-13 15:38:28 +05:30
Karan Raj Baruah
168f951ee2 Update README.md 2015-10-13 15:36:44 +05:30
Karan Raj Baruah
a39321c37c updated the pre-requisite para for more clarity
Added the part of picking one of the courses below before all the courses are listed on line #400. Removed the "PS" part below line #407
2015-10-12 23:51:21 +05:30
Eric Douglas
e398f1dc78 Fix link to enrollment 2015-10-12 05:22:34 -03:00
Eric Douglas
960af06c88 Merge pull request #138 from ramirio/master
Add Git - the simple guide to the prerequisite section
2015-10-11 16:13:16 -03:00
Cleberson Ramirio
e76f224cc1 Added modifications of the 1.2.1 version 2015-10-11 16:03:24 -03:00
Cleberson Ramirio
62a63dd26e Bumped up curriculum version to 1.2.1 2015-10-11 16:02:59 -03:00
Cleberson Ramirio
0827bf8346 Add Git - the simple guide to the prerequisite section
git - the simple guide is a good resource because provide a lot of information of the git workflow in a few minutes and it's available in 16 languages, good for someone that maybe have some difficult with English.
2015-10-11 13:46:14 -03:00
Eric Douglas
2addd3789f Merge pull request #133 from SemicolonExpected/patch-1
Fixing typos
2015-10-11 06:44:42 -03:00
Victoria Zhong
a2c069b8dc Added fix in changelog
1.1.1
2015-10-11 04:43:55 -04:00
Victoria Zhong
fe03015cfc bumped up curriculum version to 1.1.1 2015-10-11 04:28:59 -04:00
Victoria Zhong
cc21da64cd Fixing typos
As MOOC is a "Massive Open Online Course" MOOC course is redundant

Elaborated on "real problem"

Fixed a few small grammatical and wording errors
2015-10-11 00:51:23 -04:00
Eric Douglas
9f9e222724 Add Motivation & Preparation section
Optional resources:
  - Article: MIT Challenge
  - Course: Learning How to Learn
2015-10-08 17:51:09 -03:00
Eric Douglas
aa9122a9d2 Improve our motto 2015-10-08 14:23:32 -03:00
Eric Douglas
05c01d7d3e Remove OLD README file 2015-10-08 14:23:24 -03:00
Eric Douglas
0369e92792 Merge branch 'addcourses' 2015-10-08 12:14:02 -03:00
Eric Douglas
39e71e4535 Release of the verson 1.0.0 of the CS curriculum 2015-10-08 12:13:17 -03:00
Eric Douglas
1733adb313 Merge pull request #118 from elilev3/master
Fixing typo in hours/week
2015-10-08 05:03:16 -03:00
elilev3
8e185f8625 Adding additional information
Including duration of Operating Systems and System Programming
2015-10-08 02:44:13 -04:00
elilev3
a67f8866fe Fixing typo in hours/week 2015-10-08 02:31:44 -04:00
Eric Douglas
f5d81b1b90 Merge pull request #111 from floydwch/floydwch-patch-1
typo
2015-10-07 17:41:05 -03:00
floydwch
9f3d7bbd9d typo 2015-10-08 04:25:14 +08:00
Eric Douglas
d5fbddc534 Refactor of the curriculum
- Add duration and effort columns
- Cleanup the curriculum
2015-10-07 17:10:22 -03:00
Eric Douglas
1ee32cdb5f Pointing to another issue 2015-10-07 15:38:15 -03:00
Eric Douglas
760a525b60 Merge pull request #108 from MintonJ/patch-1
Update README.md
2015-10-07 14:49:22 -03:00
Jarrett
e0c9e9cf16 Update README.md
Bolded the ! after the bolded Yes under "Should I take all courses"
2015-10-07 11:31:43 -06:00
Eric Douglas
3e7cddef60 Fix IoT table 2015-10-07 11:52:57 -03:00
Eric Douglas
619b3117cf Fix courses column 2015-10-07 11:51:23 -03:00
Eric Douglas
a84860891b Merge branch 'master' of github.com:open-source-society/computer-science 2015-10-07 11:48:50 -03:00
Eric Douglas
523b41075d Add IoT section and course 2015-10-07 11:48:08 -03:00
Eric Douglas
1d1af59fc6 Add tip about focus on habits 2015-10-07 11:45:56 -03:00
Eric Douglas
ea70af9624 Add link to fcbk page 2015-10-07 11:19:45 -03:00
Eric Douglas
f6541a9b6d Merge pull request #97 from nickcannariato/patch-1
Added MIT license.
2015-10-06 20:26:32 -03:00
Nick Cannariato
f970033e26 Added MIT license.
Every project should contain a license, it's just a good idea.
2015-10-06 17:57:10 -05:00
Eric Douglas
d251fbdd6c Fix link 2015-10-06 06:01:58 -03:00