Commit Graph

40 Commits

Author SHA1 Message Date
nbuihner
a949a5e189 Rolled back a bork in the merge. 2014-06-30 10:42:08 -07:00
nbuihner
76093a9963 Merge branch 'master' into melignus-additions
Conflicts:
	README.md
2014-06-30 10:38:43 -07:00
Vinta
448fa76803 Merge pull request #8 from ellisonleao/patch-2
Add game development section and pyglet to GUI section
2014-07-01 01:24:05 +08:00
nbuihner
4fe194ea8f Added games category, a few gui modules, a few science modules. 2014-06-30 10:17:43 -07:00
Ellison Leão
c03720e214 Merge branch 'master' into patch-2 2014-06-30 14:04:43 -03:00
Vinta
33adea70e8 ok, remove the gif 2014-07-01 01:04:03 +08:00
Ellison Leão
5bb46200dc Add pyglet on GUI section 2014-06-30 14:00:45 -03:00
Ellison Leão
956885ad2a Add Game Development section 2014-06-30 13:57:49 -03:00
Vinta
b1f14337bf add ipdb to Debugging Tools section 2014-07-01 00:57:39 +08:00
Vinta
e856f31163 Merge remote-tracking branch 'ellisonleao/patch-1'
Conflicts:
	README.md

solved
2014-07-01 00:54:55 +08:00
Vinta
480f233498 Merge pull request #6 from JoseRoman/patch-2
Additions to Third-party APIs
2014-07-01 00:45:51 +08:00
Ellison Leão
13fd9a39b1 Removing some trailing whitespace 2014-06-30 13:34:10 -03:00
Ellison Leão
35f343869a Add Opps CMS on CMS section 2014-06-30 13:33:53 -03:00
Vinta
bb7ffc906c add Sublime Text plugins for Python 2014-07-01 00:05:36 +08:00
Vinta
319e08ee4d add Editor Plugins section 2014-06-30 23:54:45 +08:00
Vinta
d40d33d839 add django-simple-captcha to Anti-spam section 2014-06-30 23:49:31 +08:00
Vinta
013ada40cf Merge pull request #5 from JoseRoman/patch-1
Added Anti-spam Libraries
2014-06-30 23:41:31 +08:00
Vinta
28cb7e2a6c Merge pull request #4 from hjupadhyay/caching_links_contrib
Add Beaker under caching libraries in the README.md
2014-06-30 23:41:19 +08:00
Vinta
2c4992961f add anchors 2014-06-30 23:40:50 +08:00
Vinta
d42437fcd4 add Weekly and Twitter sections 2014-06-30 23:37:26 +08:00
Jose Roman
a1b3122b64 Additions to Third-party APIs 2014-06-30 10:46:17 -04:00
Vinta
6d96367e18 move pattern to NTP section 2014-06-30 22:41:17 +08:00
Jose Roman
24a2062a2c Added Anti-spam Libraries 2014-06-30 10:34:15 -04:00
Matheus Cardoso
dea426ca7a Added Pattern module and Textblob description 2014-06-30 22:33:03 +08:00
Harshit Upadhyay
5fc1f74afb Add HermesCache under caching libraries 2014-06-30 20:01:08 +05:30
Harshit Upadhyay
4ef2369e9c Add Beaker under caching libraries in the README.md 2014-06-30 19:54:32 +05:30
Vinta
dbe4fbf193 Merge pull request #2 from rochacbruno/master
added Quokka to CMS and web2py to frameworks
2014-06-30 22:22:17 +08:00
Bruno Rocha
cefe281d90 yeah @web2py is an awesome web framework 2014-06-30 10:49:55 -03:00
Bruno Rocha
84f1641ea0 added Quokka Project in CMS 2014-06-30 10:46:40 -03:00
Vinta
c62a204919 Merge pull request #1 from wronglink/patch-1
Added wand lib to Imagery list
2014-06-30 12:12:56 +08:00
Michael Elovskikh
b900fda388 Added wand lib to Imagery list 2014-06-30 08:22:22 +06:00
Vinta
ce7838a74c add a library for detecting nudity 2014-06-29 21:51:04 +08:00
Vinta
6139cf6278 fix doc structure 2014-06-29 19:40:16 +08:00
Vinta
cb13630afa monty 2014-06-29 19:32:01 +08:00
Vinta
b0267f664e silly walk 2014-06-29 14:17:14 +08:00
Vinta
3441b3b509 always look on the bright side of life 2014-06-28 15:26:28 +08:00
Vinta
2348dfb369 Life is short, you need Python. 2014-06-28 15:23:44 +08:00
Vinta
3939cc70b6 Ni! 2014-06-28 05:04:05 +08:00
Vinta
3f3effb52d add .gitignore 2014-06-28 05:01:39 +08:00
Vinta
794d8d3118 Initial commit 2014-06-28 05:00:06 +08:00