[ninja-ide/ninja-ide-web] aa5ecb: Update ninja_members.html

[Diego Sarmentero]

Branch: refs/heads/master
Home: https://github.com/ninja-ide/ninja-ide-web
Commit: aa5ecb24565eceb22e91634cb843b146013b3776
https://github.com/ninja-ide/ninja-ide-web/commit/aa5ecb24565eceb22e91634cb843b146013b3776
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-04-12 (Fri, 12 Apr 2013)

Changed paths:
M website/ninja_web/templates/ninja_members.html

Log Message:
-----------
Update ninja_members.html


Commit: 44559e33e34a240e94e1e2d75995a1133f6a22c2
https://github.com/ninja-ide/ninja-ide-web/commit/44559e33e34a240e94e1e2d75995a1133f6a22c2
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-05-10 (Fri, 10 May 2013)

Changed paths:
M website/ninja_web/templates/downloads.html

Log Message:
-----------
new download links


Commit: 0c0fddd8bbefc5b1223ee3e7cd4f4d12a218badb
https://github.com/ninja-ide/ninja-ide-web/commit/0c0fddd8bbefc5b1223ee3e7cd4f4d12a218badb
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-05-10 (Fri, 10 May 2013)

Changed paths:
M website/ninja_web/templates/updates_simple.html

Log Message:
-----------
update version


Commit: afd0c614a0ada504670cdcdf2353a6a791be0786
https://github.com/ninja-ide/ninja-ide-web/commit/afd0c614a0ada504670cdcdf2353a6a791be0786
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-05-10 (Fri, 10 May 2013)

Changed paths:
M website/ninja_web/templates/downloads.html

Log Message:
-----------
workaround to fix coloring problem in download section


Commit: 74aabc12b4746cbdfb73c10a431cebd220f042f0
https://github.com/ninja-ide/ninja-ide-web/commit/74aabc12b4746cbdfb73c10a431cebd220f042f0
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-05-10 (Fri, 10 May 2013)

Changed paths:
M website/ninja_web/templates/downloads.html

Log Message:
-----------
removing typo


Commit: 9bc86eb923eef2513cbfd48c64a965028292a5ff
https://github.com/ninja-ide/ninja-ide-web/commit/9bc86eb923eef2513cbfd48c64a965028292a5ff
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-05-10 (Fri, 10 May 2013)

Changed paths:
M website/ninja_web/templates/intro.html

Log Message:
-----------
update version in intro


Compare: https://github.com/ninja-ide/ninja-ide-web/compare/c91e62c598d8...9bc86eb923ee

[Diego Sarmentero]

Commit: e25f4019bfeec92809c8bf32e04834e8927bda27
https://github.com/ninja-ide/ninja-ide-web/commit/e25f4019bfeec92809c8bf32e04834e8927bda27
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
A blog/__init__.py b/website/ninja_web/blog/__init__.py
M setup/pip-requirements.txt
A website/ninja_web/blog/feeds.py
A website/ninja_web/blog/models.py
A website/ninja_web/blog/tests.py
A website/ninja_web/blog/urls.py
A website/ninja_web/blog/views.py
M website/ninja_web/common/static/common/css/styles.css
M website/ninja_web/common/static/common/css/styles.less
A website/ninja_web/common/static/common/img/sense_of_life.jpg
M website/ninja_web/plugins/models.py
M website/ninja_web/plugins/templatetags/plugins_utils.py
M website/ninja_web/plugins/views.py
M website/ninja_web/registration/auth_urls.py
M website/ninja_web/settings.py
M website/ninja_web/templates/about.html
M website/ninja_web/templates/base.html
A website/ninja_web/templates/blog/post_list.html
M website/ninja_web/templates/downloads.html
M website/ninja_web/templates/intro.html
M website/ninja_web/templates/plugin-detail.html
M website/ninja_web/templates/registration/password_reset_email.html
M website/ninja_web/urls.py

Log Message:
-----------
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide-web

Conflicts:
website/ninja_web/templates/downloads.html
website/ninja_web/templates/intro.html


Compare: https://github.com/ninja-ide/ninja-ide-web/compare/ff03329fc00e...e25f4019bfee