[ninja-ide/ninja-ide-web] 16b8ee: Merge branch 'develop'

[Pedro Mourelle]

Branch: refs/heads/develop
Home: https://github.com/ninja-ide/ninja-ide-web
Commit: 16b8eebbb727e48f0a5bf28b24f9a9f4abf45b4f
https://github.com/ninja-ide/ninja-ide-web/commit/16b8eebbb727e48f0a5bf28b24f9a9f4abf45b4f
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)

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

Log Message:
-----------
Merge branch 'develop'


Commit: 9a5fb57e3adb70e8790894c20010ea0c924ea7e3
https://github.com/ninja-ide/ninja-ide-web/commit/9a5fb57e3adb70e8790894c20010ea0c924ea7e3
Author: Pedro Mourelle <pmou...@machinalis.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
M website/ninja_web/settings.py

Log Message:
-----------
Removed comments, added sorl.thumbnail and staticfiles from django1.4


Commit: 14f21c52fd37137706b173e223aca1f7905be144
https://github.com/ninja-ide/ninja-ide-web/commit/14f21c52fd37137706b173e223aca1f7905be144
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
M website/ninja_web/settings.py

Log Message:
-----------
Removed django-compressor deprecated line.


Commit: 0859e49cbc13583a135dd6f2d7cb818d6770b9d4
https://github.com/ninja-ide/ninja-ide-web/commit/0859e49cbc13583a135dd6f2d7cb818d6770b9d4
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
M website/ninja_web/templates/plugin-detail.html

Log Message:
-----------
If plugin author has no username (created from a loaddata or admin) just the user is given with no link to profile.


Commit: 275c05e6fb8efe7b941759c912eb57c8e9859602
https://github.com/ninja-ide/ninja-ide-web/commit/275c05e6fb8efe7b941759c912eb57c8e9859602
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
M website/ninja_web/templates/registration/login.html

Log Message:
-----------
Reformatted scripts and links.


Commit: d024f66cb61e890f89f9258bfb95b08d7757e43a
https://github.com/ninja-ide/ninja-ide-web/commit/d024f66cb61e890f89f9258bfb95b08d7757e43a
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

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

Log Message:
-----------
Wrapped scripts section with scripts block tag.


Commit: e36e4f77a1aee6dd8f052973e783beb91f87aa19
https://github.com/ninja-ide/ninja-ide-web/commit/e36e4f77a1aee6dd8f052973e783beb91f87aa19
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
M website/ninja_web/plugins/views.py

Log Message:
-----------
Improved plugin detail view. If plugin does not exist then it redirects to plugins page with a very polite message.


Commit: 80a3ea8fe257367b4b0f151522acddacab352e3d
https://github.com/ninja-ide/ninja-ide-web/commit/80a3ea8fe257367b4b0f151522acddacab352e3d
Author: Pedro <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
A README.md

Log Message:
-----------
Create README.md


Commit: 303df5c8e4d4edddc3dc5261a5b5d54bddd1ed51
https://github.com/ninja-ide/ninja-ide-web/commit/303df5c8e4d4edddc3dc5261a5b5d54bddd1ed51
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-09 (Sat, 09 Mar 2013)

Changed paths:
A website/ninja_web/common/static/common/js/jquery-1.8.0.min.js

Log Message:
-----------
Updated jquery.


Commit: 0b150877e686fbd5500751e0c5927fd2324f8c34
https://github.com/ninja-ide/ninja-ide-web/commit/0b150877e686fbd5500751e0c5927fd2324f8c34
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)

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

Log Message:
-----------
Sanitizised templatetags and code.


Commit: 74cbe832f854b603447e99524d2a9c60bf51592a
https://github.com/ninja-ide/ninja-ide-web/commit/74cbe832f854b603447e99524d2a9c60bf51592a
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)

Changed paths:
M website/ninja_web/plugins/api.py

Log Message:
-----------
Fix: plugins have now absolute URLs for downloading them, not relative to site root as it was.


Commit: 77003e8ce8c0aae0787c7da89290a410e5b35010
https://github.com/ninja-ide/ninja-ide-web/commit/77003e8ce8c0aae0787c7da89290a410e5b35010
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-29 (Fri, 29 Mar 2013)

Changed paths:
M website/ninja_web/schemes/api.py

Log Message:
-----------
Absolute URL for schemes files.


Commit: b35524ff107eba8388a3e3d25f48c109dd49bd29
https://github.com/ninja-ide/ninja-ide-web/commit/b35524ff107eba8388a3e3d25f48c109dd49bd29
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-03-29 (Fri, 29 Mar 2013)

Changed paths:
A README.md
A website/ninja_web/common/static/common/js/jquery-1.8.0.min.js
M website/ninja_web/plugins/api.py
M website/ninja_web/plugins/views.py
M website/ninja_web/schemes/api.py
M website/ninja_web/templates/base.html
M website/ninja_web/templates/registration/login.html

Log Message:
-----------
Merge branch 'master' into develop


Commit: 15314a9b3710c98d9f7531e3ccbac6ba596cf970
https://github.com/ninja-ide/ninja-ide-web/commit/15314a9b3710c98d9f7531e3ccbac6ba596cf970
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-07 (Tue, 07 May 2013)

Changed paths:
M website/ninja_web/plugins/models.py

Log Message:
-----------
Pep8ized.


Commit: 60d1f6da4cfcf7191e940df0b925d2e150ee9e01
https://github.com/ninja-ide/ninja-ide-web/commit/60d1f6da4cfcf7191e940df0b925d2e150ee9e01
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-12 (Sun, 12 May 2013)

Changed paths:
M setup/pip-requirements.txt

Log Message:
-----------
Added basic apps (blog).


Commit: c4e474c14874d50a15eacff441f8fa0ae81c1860
https://github.com/ninja-ide/ninja-ide-web/commit/c4e474c14874d50a15eacff441f8fa0ae81c1860
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-12 (Sun, 12 May 2013)

Changed paths:
M website/ninja_web/urls.py

Log Message:
-----------
Added URL for blog and pep8ized.


Commit: 4026ee7a7bb8a35ffd8ee6a6d337f6766c57bf92
https://github.com/ninja-ide/ninja-ide-web/commit/4026ee7a7bb8a35ffd8ee6a6d337f6766c57bf92
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-12 (Sun, 12 May 2013)

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

Log Message:
-----------
Added translation texts. Added last plugins submitted in footer. Added link for blog.


Commit: 248c9635d3a0215e0e232f150d360b8647b398cc
https://github.com/ninja-ide/ninja-ide-web/commit/248c9635d3a0215e0e232f150d360b8647b398cc
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/plugins/templatetags/plugins_utils.py

Log Message:
-----------
Templatetag for getting last plugins.


Commit: 0068ae07f486fb9fa1ac1cf29018deb4f614a6ec
https://github.com/ninja-ide/ninja-ide-web/commit/0068ae07f486fb9fa1ac1cf29018deb4f614a6ec
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/templates/registration/password_reset_email.html

Log Message:
-----------
Fixed bug in URL in template


Commit: 24e5b81de91a21cd7965301943d753f523a99b2f
https://github.com/ninja-ide/ninja-ide-web/commit/24e5b81de91a21cd7965301943d753f523a99b2f
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/plugins/views.py

Log Message:
-----------
Pep8ized.


Commit: 321c19439fa1f029f7e8d6ff355b4302a1f4f892
https://github.com/ninja-ide/ninja-ide-web/commit/321c19439fa1f029f7e8d6ff355b4302a1f4f892
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/templates/plugin-detail.html

Log Message:
-----------
Several fixes: static files and translations. Rating position.


Commit: eb5353c03a33480f96356a25c36b3677d53dcd71
https://github.com/ninja-ide/ninja-ide-web/commit/eb5353c03a33480f96356a25c36b3677d53dcd71
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

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

Log Message:
-----------
Fixed downloads URL to use django urls.


Commit: 422a66de765be8f620e7b3e3c5a350fd59082580
https://github.com/ninja-ide/ninja-ide-web/commit/422a66de765be8f620e7b3e3c5a350fd59082580
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

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

Log Message:
-----------
More translations wrapping.


Commit: 4af114fd2940485cff17e12e144fc6541da9567c
https://github.com/ninja-ide/ninja-ide-web/commit/4af114fd2940485cff17e12e144fc6541da9567c
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/registration/auth_urls.py

Log Message:
-----------
Pep8ized.


Commit: 8958c1776c4aabaaa478076992698650331baf20
https://github.com/ninja-ide/ninja-ide-web/commit/8958c1776c4aabaaa478076992698650331baf20
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/common/static/common/css/styles.css
M website/ninja_web/common/static/common/css/styles.less

Log Message:
-----------
Changes in navigation bar and paragraphs.


Commit: 06f1a026c0cae3162420c3fe645f50103ff28a4a
https://github.com/ninja-ide/ninja-ide-web/commit/06f1a026c0cae3162420c3fe645f50103ff28a4a
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

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

Log Message:
-----------
Added translations and little faq.


Commit: 3f50a955c2575337edf2ba3b095bf0e599958685
https://github.com/ninja-ide/ninja-ide-web/commit/3f50a955c2575337edf2ba3b095bf0e599958685
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
A website/ninja_web/common/static/common/img/sense_of_life.jpg

Log Message:
-----------
Sense of life image.


Commit: 644ed42a18909af3abcfb3c37b81e3b5e8d72015
https://github.com/ninja-ide/ninja-ide-web/commit/644ed42a18909af3abcfb3c37b81e3b5e8d72015
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
A website/ninja_web/templates/blog/post_list.html

Log Message:
-----------
Templates folder for blog section


Commit: cea471ef544b1b01082a9e9f071ccd0a04e98c8c
https://github.com/ninja-ide/ninja-ide-web/commit/cea471ef544b1b01082a9e9f071ccd0a04e98c8c
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/settings.py

Log Message:
-----------
Added blog.


Commit: 59f090ecb6870b391d561729f4346585921d6e90
https://github.com/ninja-ide/ninja-ide-web/commit/59f090ecb6870b391d561729f4346585921d6e90
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/settings.py

Log Message:
-----------
Added debug_toolbar to project.


Commit: d5864c739facb7f733a9b6ac9c3fe98931aae486
https://github.com/ninja-ide/ninja-ide-web/commit/d5864c739facb7f733a9b6ac9c3fe98931aae486
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
M website/ninja_web/common/static/common/css/styles.css
M website/ninja_web/common/static/common/css/styles.less

Log Message:
-----------
Fix for less items in menu navigation.


Commit: 38dc6f155fd228c5eb128d7dba843e68a0ce8b96
https://github.com/ninja-ide/ninja-ide-web/commit/38dc6f155fd228c5eb128d7dba843e68a0ce8b96
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

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

Log Message:
-----------
Hidden blog section until ready.


Commit: c91e62c598d86332696d23a5b7acc0ffab4eb28f
https://github.com/ninja-ide/ninja-ide-web/commit/c91e62c598d86332696d23a5b7acc0ffab4eb28f
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Changed paths:
A blog/__init__.py b/website/ninja_web/blog/__init__.py
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

Log Message:
-----------
Added blog app as proxy for basic.blog


Commit: ff03329fc00e5e6bf916867b1133c337c59e5d5d
https://github.com/ninja-ide/ninja-ide-web/commit/ff03329fc00e5e6bf916867b1133c337c59e5d5d
Author: Pedro Mourelle <pedro...@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Log Message:
-----------
Merge branch 'develop' of ssh://github.com/ninja-ide/ninja-ide-web into develop


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