Merge lp:~widelands-dev/widelands-website/update_third_party_apps into lp:widelands-website
Proposed by
kaputtnik
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 524 | ||||
Proposed branch: | lp:~widelands-dev/widelands-website/update_third_party_apps | ||||
Merge into: | lp:widelands-website | ||||
Diff against target: |
396 lines (+71/-67) 23 files modified
local_settings.py.sample (+3/-4) mainpage/forms.py (+1/-1) mainpage/templates/mainpage/header.html (+2/-2) mainpage/templates/mainpage/right_boxes.html (+1/-1) pip_requirements.txt (+40/-35) templates/django_registration/activate.html (+2/-2) templates/django_registration/activation_complete.html (+2/-2) templates/django_registration/activation_email_body.txt (+1/-1) templates/django_registration/registration_complete.html (+1/-1) templates/django_registration/registration_form.html (+1/-1) templates/registration/login.html (+2/-2) templates/registration/logout.html (+1/-1) templates/registration/password_change_done.html (+1/-1) templates/registration/password_change_form.html (+1/-1) templates/registration/password_reset_complete.html (+2/-2) templates/registration/password_reset_confirm.html (+1/-1) templates/registration/password_reset_done.html (+1/-1) templates/registration/password_reset_email.html (+1/-1) templates/registration/password_reset_form.html (+1/-1) templates/star_rating/rate.html (+1/-1) threadedcomments/templates/threadedcomments/inlines/comments.html (+1/-1) urls.py (+3/-3) wlprofile/templates/wlprofile/edit_profile.html (+1/-1) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands-website/update_third_party_apps | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
GunChleoc | Approve | ||
Review via email: mp+364024@code.launchpad.net |
Commit message
Updated pip_requirement
Description of the change
Update third party apps for the virtualenvironment.
The update of django-registration fixes also an error if one demands a new password in case he has forgotten it.
The update of mysqlclient is needed also on my system, because the old one gives a compile error when trying to install it in a new virtualenvironment.
To get this in:
set maintenance
merge the branch
run: pip install -r pip_requirement
run: ./manage.py migrate
unset maintenance
To post a comment you must log in.
Just 1 nit and a few typos. Feel free to merge and deploy straight away after fixing.