[ecidadania-dev] [oscarcp/e-cidadania] c33db8: Fix Issue 171: Can not delete user account.
- From: GitHub <noreply@xxxxxxxxxx>
- To: ecidadania-dev@xxxxxxxxxxxxx
- Date: Tue, 10 Apr 2012 04:45:16 -0700
Branch: refs/heads/master
Home: https://github.com/oscarcp/e-cidadania
Commit: c33db841a9cf982b5a2d0242d5a6be3357b788ac
https://github.com/oscarcp/e-cidadania/commit/c33db841a9cf982b5a2d0242d5a6be3357b788ac
Author: Praveen Kumar <praveen97uma@xxxxxxxxx>
Date: 2012-03-26 (Mon, 26 Mar 2012)
Changed paths:
M
src/e_cidadania/apps/userprofile/templates/userprofile/profile/delete_done.html
Log Message:
-----------
Fix Issue 171: Can not delete user account.
Commit: ed728bf046a1d30a89e894fcc64b37ddf39d278d
https://github.com/oscarcp/e-cidadania/commit/ed728bf046a1d30a89e894fcc64b37ddf39d278d
Author: Michał Poczwardowski <dmp0x7c5@xxxxxxxxx>
Date: 2012-03-26 (Mon, 26 Mar 2012)
Changed paths:
M src/e_cidadania/templates/comments/posted.html
Log Message:
-----------
Changed redirection after posted comment. It could be fix for #142.
Commit: 34023189b2f352d9d67922a98b97977ac0644aee
https://github.com/oscarcp/e-cidadania/commit/34023189b2f352d9d67922a98b97977ac0644aee
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M
src/e_cidadania/apps/userprofile/templates/userprofile/profile/delete_done.html
Log Message:
-----------
Merge pull request #25 from praveen97uma/master
Patch for Issue 171
Commit: d1e80c33de12d75a60a24b79a677e890bef59c41
https://github.com/oscarcp/e-cidadania/commit/d1e80c33de12d75a60a24b79a677e890bef59c41
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/templates/comments/posted.html
Log Message:
-----------
Merge pull request #26 from dmp0x7c5/master
#142
Commit: 600ac58e07bcec7b955844de7ef5c9b9455bd341
https://github.com/oscarcp/e-cidadania/commit/600ac58e07bcec7b955844de7ef5c9b9455bd341
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/apps/proposals/views.py
Log Message:
-----------
Fixed proposals view. If the ID didn't match the list index it raised
an IndexError
Commit: 53c4f37319c55eda6677d1bfcea6a62fd0517936
https://github.com/oscarcp/e-cidadania/commit/53c4f37319c55eda6677d1bfcea6a62fd0517936
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M
src/e_cidadania/apps/userprofile/templates/userprofile/profile/delete_done.html
M src/e_cidadania/templates/comments/posted.html
Log Message:
-----------
Merge branch 'master' of git://github.com/cidadania/e-cidadania
Commit: 207c1f01d17ce2c5b5da33a3ab12b6d11f459133
https://github.com/oscarcp/e-cidadania/commit/207c1f01d17ce2c5b5da33a3ab12b6d11f459133
Author: Praveen Kumar <praveen97uma@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/apps/userprofile/views.py
Log Message:
-----------
Fix style and include license files.
Commit: 5ed78f8f26f1964bad56457bfd5e92a33b5d2bdf
https://github.com/oscarcp/e-cidadania/commit/5ed78f8f26f1964bad56457bfd5e92a33b5d2bdf
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/apps/userprofile/views.py
Log Message:
-----------
Merge pull request #27 from praveen97uma/master
Fix style and include the license in userprofile.views module
Commit: 8e0998e18b311e102fc1ef8123ec8e88979bf895
https://github.com/oscarcp/e-cidadania/commit/8e0998e18b311e102fc1ef8123ec8e88979bf895
Author: Tzbob <tzbobr@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
redirect bug in file upload, hasn't been trac'd as far as I can see
Commit: 0f86696ac3aaa18dfd871f3d9ba8682872769469
https://github.com/oscarcp/e-cidadania/commit/0f86696ac3aaa18dfd871f3d9ba8682872769469
Author: Mohamed Ashraf <mohamed.ashraf.213@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
A src/e_cidadania/static_files/img/facebook.png
A src/e_cidadania/static_files/img/googleplus.jpg
A src/e_cidadania/static_files/img/twitter.png
M src/e_cidadania/templates/invite.html
M src/e_cidadania/views.py
Log Message:
-----------
Added invite functionality using Facebook, Twitter and Google+.
Commit: f393602ef01a872cf0648e9cfa033c0f91cc66c7
https://github.com/oscarcp/e-cidadania/commit/f393602ef01a872cf0648e9cfa033c0f91cc66c7
Author: Tzbob <tzbobr@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/templates/spaces/document_list.html
M src/e_cidadania/apps/spaces/templates/spaces/space_index.html
Log Message:
-----------
fix document url ticket #170
Commit: e6c6bd95e14fdcf0501c195dc80ebd375ef8662c
https://github.com/oscarcp/e-cidadania/commit/e6c6bd95e14fdcf0501c195dc80ebd375ef8662c
Author: Tzbob <tzbobr@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
M src/e_cidadania/templates/menu.html
Log Message:
-----------
add enhancement #162, flags implemented with inline css (source:
ecidadania.org) could create a class if needed, added static flag files
Commit: 0dbe2c95020e82e582a0844f2f9f1e5bea344128
https://github.com/oscarcp/e-cidadania/commit/0dbe2c95020e82e582a0844f2f9f1e5bea344128
Author: Tzbob <tzbobr@xxxxxxxxx>
Date: 2012-03-27 (Tue, 27 Mar 2012)
Changed paths:
A src/e_cidadania/static_files/assets/flags/en_GB.gif
A src/e_cidadania/static_files/assets/flags/es_ES.gif
A src/e_cidadania/static_files/assets/flags/gl_ES.gif
Log Message:
-----------
add enhancement #162, flags implemented with inline css (source:
ecidadania.org) could create a class if needed, added static flag files
Commit: dc87b390100f8fc30047ecdc2f80f29479a8af96
https://github.com/oscarcp/e-cidadania/commit/dc87b390100f8fc30047ecdc2f80f29479a8af96
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M docs/en/docs/configuration.rst
M docs/en/docs/deployment.rst
M docs/en/docs/usermanual.rst
M docs/en/theming/themes.rst
M src/e_cidadania/apps/proposals/views.py
Log Message:
-----------
Finishwed documentation translation to english
Commit: 6b4897823517411f1edb8a0808fa5e6651116f5d
https://github.com/oscarcp/e-cidadania/commit/6b4897823517411f1edb8a0808fa5e6651116f5d
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M src/e_cidadania/apps/debate/views.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/apps/userprofile/views.py
M src/e_cidadania/dashboard.py
M src/e_cidadania/settings.py
M src/e_cidadania/urls.py
M src/e_cidadania/views.py
Log Message:
-----------
Minor code styling following pylint rules
Commit: 27f0971f3ea09ded79ffca4c8db70b31d5155bac
https://github.com/oscarcp/e-cidadania/commit/27f0971f3ea09ded79ffca4c8db70b31d5155bac
Author: Tzbob <tzbobr@xxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M docs/en/docs/configuration.rst
M docs/en/docs/deployment.rst
M docs/en/docs/usermanual.rst
M docs/en/theming/themes.rst
M src/e_cidadania/apps/debate/views.py
M src/e_cidadania/apps/proposals/views.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/apps/userprofile/views.py
M src/e_cidadania/dashboard.py
M src/e_cidadania/settings.py
M src/e_cidadania/urls.py
M src/e_cidadania/views.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: bf9be5262d7a373c062ef9c5d7fb81177d3bbc12
https://github.com/oscarcp/e-cidadania/commit/bf9be5262d7a373c062ef9c5d7fb81177d3bbc12
Author: Tzbob <tzbobr@xxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M src/e_cidadania/static_files/css/screen.css
M src/e_cidadania/templates/menu.html
Log Message:
-----------
fix #162, should meet requirements now, flags have been embedded in a
dropdown list
Commit: 76b3a4f268e3ed4ea3d591d169d5caa44cf28fcf
https://github.com/oscarcp/e-cidadania/commit/76b3a4f268e3ed4ea3d591d169d5caa44cf28fcf
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/templates/spaces/document_list.html
M src/e_cidadania/apps/spaces/templates/spaces/space_index.html
M src/e_cidadania/apps/spaces/views.py
A src/e_cidadania/static_files/assets/flags/en_GB.gif
A src/e_cidadania/static_files/assets/flags/es_ES.gif
A src/e_cidadania/static_files/assets/flags/gl_ES.gif
M src/e_cidadania/static_files/css/screen.css
M src/e_cidadania/templates/menu.html
Log Message:
-----------
Merge pull request #29 from Tzbob/master
Bug fixes and enhancement
Commit: d2342a6d922965d6eab1044bbcd0aea78734a69f
https://github.com/oscarcp/e-cidadania/commit/d2342a6d922965d6eab1044bbcd0aea78734a69f
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M src/e_cidadania/settings.py
Log Message:
-----------
Removed unnecesary info from the settings
Commit: a0a619032d3ad7b7da5452f0fa04cc9a489cd5ac
https://github.com/oscarcp/e-cidadania/commit/a0a619032d3ad7b7da5452f0fa04cc9a489cd5ac
Author: Tamara Atanasoska <tamara.atanasoska20@xxxxxxxxx>
Date: 2012-03-28 (Wed, 28 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/models.py
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/templates/not_allowed.html
A src/e_cidadania/templates/space_intent.html
A src/e_cidadania/templates/validate_intent.html
Log Message:
-----------
I want to participate button
When a user tries to access a space that is private, sees a button "I want to
participate" that when clicked, sends an email to the administrator
that contains a link for the administrator to click and approve the user to use
the space.
Commit: 6e55e7aa9499377923e42159ca07019ee57b6f2a
https://github.com/oscarcp/e-cidadania/commit/6e55e7aa9499377923e42159ca07019ee57b6f2a
Author: Bithin A <bithin2007@xxxxxxxxx>
Date: 2012-03-29 (Thu, 29 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Fixed Attribute error in space views
Commit: fa3fdd19ee85db956dafa0cd1f7053f92935c3d6
https://github.com/oscarcp/e-cidadania/commit/fa3fdd19ee85db956dafa0cd1f7053f92935c3d6
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-29 (Thu, 29 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Merge pull request #30 from bithin/master
Fixed Attribute error in space views
Commit: ffe74b1bf421344f8fff5521fd4421a34ec52230
https://github.com/oscarcp/e-cidadania/commit/ffe74b1bf421344f8fff5521fd4421a34ec52230
Author: Tamara Atanasoska <tamara.atanasoska20@xxxxxxxxx>
Date: 2012-03-29 (Thu, 29 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Merge branch 'master' of github.com:TamaraAtanasoska/e-cidadania
Commit: a86a7e86f17e0c38d611541598d79f0c478d72de
https://github.com/oscarcp/e-cidadania/commit/a86a7e86f17e0c38d611541598d79f0c478d72de
Author: Tamara Atanasoska <tamara.atanasoska20@xxxxxxxxx>
Date: 2012-03-29 (Thu, 29 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Small changes
Docstrings and heading string
Commit: 3ffd0f952ca464d1f8cb5dd90dfaf4970fe3ee64
https://github.com/oscarcp/e-cidadania/commit/3ffd0f952ca464d1f8cb5dd90dfaf4970fe3ee64
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-29 (Thu, 29 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/models.py
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/templates/not_allowed.html
A src/e_cidadania/templates/space_intent.html
A src/e_cidadania/templates/validate_intent.html
Log Message:
-----------
Merge pull request #31 from TamaraAtanasoska/master
Fix: "I want to participate button"
Commit: 81b8e91d9c889ddb0bf7baca3ffc19cac9c74607
https://github.com/oscarcp/e-cidadania/commit/81b8e91d9c889ddb0bf7baca3ffc19cac9c74607
Author: Bithin A <bithin2007@xxxxxxxxx>
Date: 2012-03-30 (Fri, 30 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Attribute error corrected
Commit: 499e0ecef4f429beb6aa47732909195fc956b61f
https://github.com/oscarcp/e-cidadania/commit/499e0ecef4f429beb6aa47732909195fc956b61f
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-03-30 (Fri, 30 Mar 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Merge pull request #32 from bithin/master
Fixed Attribute error in space views
Commit: 6d7ed112240d7c2d248098e3570ad1ad56e73f32
https://github.com/oscarcp/e-cidadania/commit/6d7ed112240d7c2d248098e3570ad1ad56e73f32
Author: Arvind S Raj <sraj.arvind@xxxxxxxxx>
Date: 2012-03-31 (Sat, 31 Mar 2012)
Changed paths:
M src/e_cidadania/apps/accounts/models.py
Log Message:
-----------
Added validator to ensure phone number contains only digits
Commit: e01e044a807df8fcce2ee4902b624a872295d787
https://github.com/oscarcp/e-cidadania/commit/e01e044a807df8fcce2ee4902b624a872295d787
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-01 (Sun, 01 Apr 2012)
Changed paths:
M src/e_cidadania/apps/accounts/models.py
Log Message:
-----------
Merge pull request #33 from arvindsraj/master
Added validator to ensure that phone number contains only digits
Commit: 63612e24341b6ae0de1c2152fc0845c845469387
https://github.com/oscarcp/e-cidadania/commit/63612e24341b6ae0de1c2152fc0845c845469387
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-02 (Mon, 02 Apr 2012)
Changed paths:
A src/e_cidadania/static_files/img/facebook.png
A src/e_cidadania/static_files/img/googleplus.jpg
A src/e_cidadania/static_files/img/twitter.png
M src/e_cidadania/templates/invite.html
M src/e_cidadania/views.py
Log Message:
-----------
Merge git://github.com/m0hamed/e-cidadania
Conflicts:
src/e_cidadania/views.py
Commit: 340a29769b15e5d3291f3145f5a0fc7d5eb4e061
https://github.com/oscarcp/e-cidadania/commit/340a29769b15e5d3291f3145f5a0fc7d5eb4e061
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-02 (Mon, 02 Apr 2012)
Changed paths:
M src/e_cidadania/apps/accounts/models.py
M src/e_cidadania/apps/spaces/models.py
M src/e_cidadania/apps/spaces/templates/spaces/document_list.html
M src/e_cidadania/apps/spaces/templates/spaces/space_index.html
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/settings.py
A src/e_cidadania/static_files/assets/flags/en_GB.gif
A src/e_cidadania/static_files/assets/flags/es_ES.gif
A src/e_cidadania/static_files/assets/flags/gl_ES.gif
M src/e_cidadania/static_files/css/screen.css
M src/e_cidadania/templates/menu.html
M src/e_cidadania/templates/not_allowed.html
A src/e_cidadania/templates/space_intent.html
A src/e_cidadania/templates/validate_intent.html
Log Message:
-----------
Merge branch 'master' of git://github.com/cidadania/e-cidadania
Commit: 6f57e02c15ae518cf83743a61c20aef80919d95d
https://github.com/oscarcp/e-cidadania/commit/6f57e02c15ae518cf83743a61c20aef80919d95d
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-02 (Mon, 02 Apr 2012)
Changed paths:
M src/e_cidadania/apps/userprofile/templates/userprofile/account/login.html
M src/e_cidadania/templates/invite.html
M src/e_cidadania/views.py
Log Message:
-----------
Fixed minor bugs in invitation systems and updated some links in login page
Commit: 141ab81c1baf7b5b0f84b7a25a42858e18f1fa0b
https://github.com/oscarcp/e-cidadania/commit/141ab81c1baf7b5b0f84b7a25a42858e18f1fa0b
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-02 (Mon, 02 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Fixed intent styling
Commit: f4b446e116f64cfb65cb633e9b94d43311f4e6e3
https://github.com/oscarcp/e-cidadania/commit/f4b446e116f64cfb65cb633e9b94d43311f4e6e3
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-02 (Mon, 02 Apr 2012)
Changed paths:
M src/e_cidadania/settings.py
Log Message:
-----------
Typo fix in line 5 of settings.py file
modift changed to modify
Commit: 58af89ff358061705007dffb686eb97709030eb8
https://github.com/oscarcp/e-cidadania/commit/58af89ff358061705007dffb686eb97709030eb8
Author: Tamara Atanasoska <tamara.atanasoska20@xxxxxxxxx>
Date: 2012-04-03 (Tue, 03 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
validate_intent function made into class based view ValidateIntent
Commit: 214389c47306b89ad14a383026b9ad8f26ffe566
https://github.com/oscarcp/e-cidadania/commit/214389c47306b89ad14a383026b9ad8f26ffe566
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-04 (Wed, 04 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/spaces/views.py
Log Message:
-----------
Merge pull request #35 from TamaraAtanasoska/master
Class based views refactor of validate_intent
Commit: 2506313dfaf66a86ae6d834a70dd7f56602b0810
https://github.com/oscarcp/e-cidadania/commit/2506313dfaf66a86ae6d834a70dd7f56602b0810
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-04 (Wed, 04 Apr 2012)
Changed paths:
M src/e_cidadania/settings.py
Log Message:
-----------
Merge pull request #34 from he116ra1n/typofix
Typo fix in line 5 of settings.py file
Commit: 14afdff96adfa611d577f70b26844a22b9bad382
https://github.com/oscarcp/e-cidadania/commit/14afdff96adfa611d577f70b26844a22b9bad382
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-04 (Wed, 04 Apr 2012)
Changed paths:
M src/e_cidadania/urls.py
Log Message:
-----------
Changed url patterns to i18n_patterns
This allows LocaleMiddleWare to find the user's language straight from
the requested URL.
Commit: a6ebc06386577c6ecaee2b2295d06fc1802dcb4e
https://github.com/oscarcp/e-cidadania/commit/a6ebc06386577c6ecaee2b2295d06fc1802dcb4e
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-04 (Wed, 04 Apr 2012)
Changed paths:
M src/e_cidadania/urls.py
Log Message:
-----------
A minor change to urls.py
The administrator can now access the admin page with both mainrul/admin/
and mainurl/amdin
This is a small regex change, but could save some trouble.
Commit: 9232ae58cdf71d882da43b003549af3859577f28
https://github.com/oscarcp/e-cidadania/commit/9232ae58cdf71d882da43b003549af3859577f28
Author: Dhritiman Hazarika <dhritimanh@xxxxxxxxx>
Date: 2012-04-05 (Thu, 05 Apr 2012)
Changed paths:
A src/e_cidadania/apps/spaces/fixtures/temp.json
A src/e_cidadania/apps/spaces/fixtures/temp1.json
M src/e_cidadania/apps/spaces/tests.py
Log Message:
-----------
Added some unit tests to views in space app
Commit: 7809541dbcb60d3d5b77f7bd0d9b98332c6a68a1
https://github.com/oscarcp/e-cidadania/commit/7809541dbcb60d3d5b77f7bd0d9b98332c6a68a1
Author: Dhritiman Hazarika <dhritimanh@xxxxxxxxx>
Date: 2012-04-05 (Thu, 05 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/tests.py
Log Message:
-----------
Tests modifications
Commit: f05b26f9a837f69bc4191beb1800d6596400bc93
https://github.com/oscarcp/e-cidadania/commit/f05b26f9a837f69bc4191beb1800d6596400bc93
Author: Dhritiman Hazarika <dhritimanh@xxxxxxxxx>
Date: 2012-04-05 (Thu, 05 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/tests.py
Log Message:
-----------
unit tests for views processing get requests in spaces
Commit: 95ce861cd578eca1d598459aa43279753bf3d08b
https://github.com/oscarcp/e-cidadania/commit/95ce861cd578eca1d598459aa43279753bf3d08b
Author: Tamara Atanasoska <tamara.atanasoska20@xxxxxxxxx>
Date: 2012-04-05 (Thu, 05 Apr 2012)
Changed paths:
M src/e_cidadania/apps/userprofile/forms.py
A
src/e_cidadania/apps/userprofile/templates/userprofile/email/email_change.html
A
src/e_cidadania/apps/userprofile/templates/userprofile/email/email_change_done.html
M src/e_cidadania/apps/userprofile/templates/userprofile/profile/overview.html
M src/e_cidadania/apps/userprofile/urls/en.py
M src/e_cidadania/apps/userprofile/views.py
Log Message:
-----------
176 bug fix | add functionality to change email
Added templates, new options menu item, new form that inherits from
EmailValidationForm..
Commit: 95d180093d446670333f597e6d6d812444f2afa4
https://github.com/oscarcp/e-cidadania/commit/95d180093d446670333f597e6d6d812444f2afa4
Author: Dhritiman Hazarika <dhritimanh@xxxxxxxxx>
Date: 2012-04-05 (Thu, 05 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/settings.py
Log Message:
-----------
Fixed a bug in uploading documents to a given space
Commit: 91c18ffbc2170524a88edfc4836b1c70b19d1b30
https://github.com/oscarcp/e-cidadania/commit/91c18ffbc2170524a88edfc4836b1c70b19d1b30
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-06 (Fri, 06 Apr 2012)
Changed paths:
M src/e_cidadania/urls.py
Log Message:
-----------
Fixed major bug in last commit
Changing the language from the menu is now working again.
Commit: 12c1f43e9298fac2221e0d510b22c901c969c337
https://github.com/oscarcp/e-cidadania/commit/12c1f43e9298fac2221e0d510b22c901c969c337
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-06 (Fri, 06 Apr 2012)
Changed paths:
M src/e_cidadania/apps/cal/urls.py
M src/e_cidadania/apps/debate/urls.py
M src/e_cidadania/apps/news/urls.py
M src/e_cidadania/apps/proposals/urls.py
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/urls.py
Log Message:
-----------
Implimented translatable urls
Urls are now translatable. With the exception of urls for the module
"useraccounts".
Used ugettext_lazy().
Commit: 345481dabb994b60ac4839914be2d3a6fb5053d3
https://github.com/oscarcp/e-cidadania/commit/345481dabb994b60ac4839914be2d3a6fb5053d3
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-07 (Sat, 07 Apr 2012)
Changed paths:
M src/e_cidadania/apps/userprofile/forms.py
A
src/e_cidadania/apps/userprofile/templates/userprofile/email/email_change.html
A
src/e_cidadania/apps/userprofile/templates/userprofile/email/email_change_done.html
M src/e_cidadania/apps/userprofile/templates/userprofile/profile/overview.html
M src/e_cidadania/apps/userprofile/urls/en.py
M src/e_cidadania/apps/userprofile/views.py
Log Message:
-----------
Merge pull request #40 from TamaraAtanasoska/master
176 bug fix (user can now change email)
Commit: 9135012a0c7c3f6b6a6e516ef5c439467f89bb5a
https://github.com/oscarcp/e-cidadania/commit/9135012a0c7c3f6b6a6e516ef5c439467f89bb5a
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-07 (Sat, 07 Apr 2012)
Changed paths:
A src/e_cidadania/apps/spaces/fixtures/temp.json
A src/e_cidadania/apps/spaces/fixtures/temp1.json
M src/e_cidadania/apps/spaces/tests.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/settings.py
Log Message:
-----------
Merge pull request #41 from dhritimanh/master
Solved a bug in the upload documents section in a space
Commit: 76f807199899b3ac7a73bbd2c82b9223f617596f
https://github.com/oscarcp/e-cidadania/commit/76f807199899b3ac7a73bbd2c82b9223f617596f
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/settings.py
Log Message:
-----------
Fixed settings
Commit: 66ed46b3b12c3477bc2e9d4f81e3ba8ef49cf095
https://github.com/oscarcp/e-cidadania/commit/66ed46b3b12c3477bc2e9d4f81e3ba8ef49cf095
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/accounts/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/accounts/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/accounts/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/en_GB/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/debate/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/es_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/debate/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/gl_ES/LC_MESSAGES/djangojs.po
A src/e_cidadania/apps/massmail/locale/en_GB/LC_MESSAGES/django.po
A src/e_cidadania/apps/massmail/locale/es_ES/LC_MESSAGES/django.po
A src/e_cidadania/apps/massmail/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/apps/staticpages/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/templates/locale/en_GB/LC_MESSAGES/django.po
A src/e_cidadania/templates/locale/en_GB/LC_MESSAGES/djangojs.po
A src/e_cidadania/templates/locale/es_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/templates/locale/gl_ES/LC_MESSAGES/django.po
A src/e_cidadania/templates/locale/gl_ES/LC_MESSAGES/djangojs.po
Log Message:
-----------
Updated language catalogs
Commit: 224ae6c678e39a8e9a3929e1e6af60743dabe814
https://github.com/oscarcp/e-cidadania/commit/224ae6c678e39a8e9a3929e1e6af60743dabe814
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/userprofile/templates/userprofile/account/login.html
Log Message:
-----------
Hide user tools links in login page if user is logged in
Commit: 17ea2b10b98edab8380f56674d61ae714b72b973
https://github.com/oscarcp/e-cidadania/commit/17ea2b10b98edab8380f56674d61ae714b72b973
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/settings.py
Log Message:
-----------
Fix #177: Back to site link in admin site
Commit: de1513fa6ecc9e9211e83d711c85aa09f2dd2d72
https://github.com/oscarcp/e-cidadania/commit/de1513fa6ecc9e9211e83d711c85aa09f2dd2d72
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/settings.py
Log Message:
-----------
Code style fix
Commit: 41688f729fcca48bef4d6d7d244cdc855c62a517
https://github.com/oscarcp/e-cidadania/commit/41688f729fcca48bef4d6d7d244cdc855c62a517
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
R src/e_cidadania/manage.py
M src/e_cidadania/requirements.txt
M src/e_cidadania/settings.py
Log Message:
-----------
Updated project structure to meet django 1.4
Commit: 5dc9d712b116ee0f61f71b12c2e2359b50a9af91
https://github.com/oscarcp/e-cidadania/commit/5dc9d712b116ee0f61f71b12c2e2359b50a9af91
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
A src/manage.py
Log Message:
-----------
Relocated manage.py for django 1.4
Commit: 551bc4da0c40de342c6ee30d40fc22887991764f
https://github.com/oscarcp/e-cidadania/commit/551bc4da0c40de342c6ee30d40fc22887991764f
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/accounts/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/accounts/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/accounts/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/en_GB/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/debate/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/es_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/debate/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/gl_ES/LC_MESSAGES/djangojs.po
A src/e_cidadania/apps/massmail/locale/en_GB/LC_MESSAGES/django.po
A src/e_cidadania/apps/massmail/locale/es_ES/LC_MESSAGES/django.po
A src/e_cidadania/apps/massmail/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/gl_ES/LC_MESSAGES/django.po
A src/e_cidadania/apps/spaces/fixtures/temp.json
A src/e_cidadania/apps/spaces/fixtures/temp1.json
M src/e_cidadania/apps/spaces/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/tests.py
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/spaces/views.py
M src/e_cidadania/apps/staticpages/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/userprofile/forms.py
M src/e_cidadania/apps/userprofile/templates/userprofile/account/login.html
A
src/e_cidadania/apps/userprofile/templates/userprofile/email/email_change.html
A
src/e_cidadania/apps/userprofile/templates/userprofile/email/email_change_done.html
M src/e_cidadania/apps/userprofile/templates/userprofile/profile/overview.html
M src/e_cidadania/apps/userprofile/urls/en.py
M src/e_cidadania/apps/userprofile/views.py
R src/e_cidadania/manage.py
M src/e_cidadania/requirements.txt
M src/e_cidadania/settings.py
M src/e_cidadania/templates/locale/en_GB/LC_MESSAGES/django.po
A src/e_cidadania/templates/locale/en_GB/LC_MESSAGES/djangojs.po
A src/e_cidadania/templates/locale/es_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/templates/locale/gl_ES/LC_MESSAGES/django.po
A src/e_cidadania/templates/locale/gl_ES/LC_MESSAGES/djangojs.po
A src/manage.py
Log Message:
-----------
Merge branch 'master' into translatable_urls
Conflicts:
src/e_cidadania/apps/spaces/urls.py
Commit: d8830bfe2afbb511dc1962d5cc072c658b645e3c
https://github.com/oscarcp/e-cidadania/commit/d8830bfe2afbb511dc1962d5cc072c658b645e3c
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/cal/urls.py
M src/e_cidadania/apps/news/urls.py
M src/e_cidadania/apps/proposals/urls.py
Log Message:
-----------
Removed inapropriate url translations
Commit: 91b4ce649e3e9a7831eb9f114b990ffad874d9f9
https://github.com/oscarcp/e-cidadania/commit/91b4ce649e3e9a7831eb9f114b990ffad874d9f9
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/cal/urls.py
M src/e_cidadania/apps/debate/urls.py
M src/e_cidadania/apps/news/urls.py
M src/e_cidadania/apps/proposals/urls.py
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/urls.py
Log Message:
-----------
Merge pull request #43 from he116ra1n/translatable_urls
Translatable urls
Commit: db8cd859ca7bae26acf1afa35f9ad8932c02f557
https://github.com/oscarcp/e-cidadania/commit/db8cd859ca7bae26acf1afa35f9ad8932c02f557
Author: he116ra1n <hugo.deslongchamps@xxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/urls.py
Log Message:
-----------
fixed bug from last merge
Commit: a88a8ff8b50c0a94db9495fca04a09cd5e51ddff
https://github.com/oscarcp/e-cidadania/commit/a88a8ff8b50c0a94db9495fca04a09cd5e51ddff
Author: Oscar Carballal <oscar.carballal@xxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/urls.py
Log Message:
-----------
Merge pull request #46 from he116ra1n/master
quick fix in apps/spaces/urls.py
Commit: 5580b245ea5d074b5838768b59c76be6772c14d5
https://github.com/oscarcp/e-cidadania/commit/5580b245ea5d074b5838768b59c76be6772c14d5
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M src/e_cidadania/apps/spaces/urls.py
Log Message:
-----------
Minor fix. Removed merge code
Commit: 43ca2fbc3f6683ff1837e942925cabf33a0ac173
https://github.com/oscarcp/e-cidadania/commit/43ca2fbc3f6683ff1837e942925cabf33a0ac173
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Log Message:
-----------
Merge branch 'master' of git://github.com/cidadania/e-cidadania
Commit: c21baacfb9b71207fd6d07b10cb96d4ca8c984fd
https://github.com/oscarcp/e-cidadania/commit/c21baacfb9b71207fd6d07b10cb96d4ca8c984fd
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M src/e_cidadania/apps/accounts/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/accounts/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/accounts/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/cal/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/en_GB/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/debate/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/es_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/debate/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/debate/locale/gl_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/apps/massmail/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/massmail/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/massmail/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/news/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/proposals/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/spaces/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/apps/staticpages/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/templates/locale/en_GB/LC_MESSAGES/django.po
M src/e_cidadania/templates/locale/en_GB/LC_MESSAGES/djangojs.po
M src/e_cidadania/templates/locale/es_ES/LC_MESSAGES/django.po
M src/e_cidadania/templates/locale/es_ES/LC_MESSAGES/djangojs.po
M src/e_cidadania/templates/locale/gl_ES/LC_MESSAGES/django.po
M src/e_cidadania/templates/locale/gl_ES/LC_MESSAGES/djangojs.po
Log Message:
-----------
Updated language catalogs with URL translation
Commit: 61baf2b00ea05e727993ad57ed4f0a841a6e6350
https://github.com/oscarcp/e-cidadania/commit/61baf2b00ea05e727993ad57ed4f0a841a6e6350
Author: Oscar Carballal Prego <info@xxxxxxxxxxx>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M src/e_cidadania/apps/accounts/urls.py
M src/e_cidadania/apps/cal/urls.py
M src/e_cidadania/apps/debate/urls.py
M src/e_cidadania/apps/news/urls.py
M src/e_cidadania/apps/proposals/urls.py
M src/e_cidadania/apps/spaces/urls.py
M src/e_cidadania/apps/staticpages/urls.py
M src/e_cidadania/apps/userprofile/urls/en.py
M src/e_cidadania/settings.py
M src/e_cidadania/urls.py
Log Message:
-----------
Fixed #185 and some minor bug fixes for django 1.4 migration
Compare: https://github.com/oscarcp/e-cidadania/compare/94f82b9...61baf2b
Other related posts:
- » [ecidadania-dev] [oscarcp/e-cidadania] c33db8: Fix Issue 171: Can not delete user account. - GitHub
