← Back to branch summary

~widelands-dev/widelands-website/inquiry_spam

~widelands-dev/widelands-website/inquiry_spam

Viewing all changes in revision 518.

Committer: franku
Date: 2019-02-14 23:07:43 UTC
mfrom: (513.2.6 widelands)
Revision ID: somal@arcor.de-20190214230743-ol4pwxhjlx60arg6

merged trunk, resoloved conflict

files added:
check_input/templates

mainpage/templates

news/templates

notification/templates

pybb/templates

threadedcomments/templates

wiki/templates

wlggz/templates

wlhelp/templates

wlimages/templates

wlmaps/templates

wlpoll/templates

wlprofile/templates

wlscheduling/templates

wlscreens/templates

wlwebchat/templates

files removed:
wlprofile/context_processors.py

files renamed:
templates/check_input/ => check_input/templates/check_input/

templates/mainpage/ => mainpage/templates/mainpage/

templates/base.html => mainpage/templates/mainpage/base.html

templates/footer.html => mainpage/templates/mainpage/footer.html

templates/header.html => mainpage/templates/mainpage/header.html

templates/mainpage.html => mainpage/templates/mainpage/mainpage.html

templates/navigation.html => mainpage/templates/mainpage/navigation.html

templates/privacy_policy.html => mainpage/templates/mainpage/privacy_policy.html

templates/right_boxes.html => mainpage/templates/mainpage/right_boxes.html

templates/news/ => news/templates/news/

templates/notification/ => notification/templates/notification/

templates/pybb/ => pybb/templates/pybb/

templates/threadedcomments/ => threadedcomments/templates/threadedcomments/

templates/wiki/ => wiki/templates/wiki/

templates/wlggz/ => wlggz/templates/wlggz/

templates/wlhelp/ => wlhelp/templates/wlhelp/

templates/wlimages/ => wlimages/templates/wlimages/

templates/wlmaps/ => wlmaps/templates/wlmaps/

templates/wlpoll/ => wlpoll/templates/wlpoll/

templates/wlprofile/ => wlprofile/templates/wlprofile/

templates/wlscheduling/ => wlscheduling/templates/wlscheduling/

templates/wlscreens/ => wlscreens/templates/wlscreens/

templates/wlwebchat/ => wlwebchat/templates/wlwebchat/

files modified:
README.txt

check_input/templates/check_input/moderate_info.html

mainpage/admin.py

mainpage/templates/mainpage/changelog.html

mainpage/templates/mainpage/developers.html

mainpage/templates/mainpage/legal_notice.html

mainpage/templates/mainpage/legal_notice_thanks.html

mainpage/views.py

news/templates/news/base_news.html

news/templates/news/inlines/posts_table.html

privacy_policy/views.py

pybb/templates/pybb/base.html

pybb/templates/pybb/feeds/posts_description.html

pybb/templates/pybb/feeds/topics_description.html

settings.py

templates/404.html

templates/500.html

templates/registration/base.html

templates/search/includes/posts.html

templates/search/includes/topics.html

templates/search/search.html

threadedcomments/templates/threadedcomments/preview_comment.html

wiki/admin.py

wiki/templates/wiki/base.html

wiki/templates/wiki/edit.html

wiki/templates/wiki/feeds/history_description.html

wiki/views.py

wl_utils.py

wlggz/templates/wlggz/edit_ggz.html

wlhelp/templates/wlhelp/base.html

wlimages/templates/wlimages/upload.html

wlmaps/templates/wlmaps/base.html

wlpoll/templates/wlpoll/base.html

wlpoll/templates/wlpoll/poll_list.html

wlprofile/admin.py

wlprofile/templates/wlprofile/base.html

wlprofile/templates/wlprofile/delete_me.html

wlprofile/templatetags/wlprofile_extras.py

wlprofile/views.py

wlscheduling/templates/wlscheduling/base.html

wlscreens/templates/wlscreens/base.html

wlsearch/static/js/search.js

wlwebchat/templates/wlwebchat/index.html

Show diffs side-by-side

added added

removed removed

check_input/templates/

check_input/templates/check_input/moderate_info.html

mainpage/admin.py

mainpage/templates/

mainpage/templates/mainpage/base.html

mainpage/templates/mainpage/changelog.html

mainpage/templates/mainpage/developers.html

mainpage/templates/mainpage/legal_notice.html

mainpage/templates/mainpage/legal_notice_thanks.html

mainpage/templates/mainpage/mainpage.html

mainpage/templates/mainpage/privacy_policy.html

mainpage/views.py

news/templates/

news/templates/news/base_news.html

news/templates/news/inlines/posts_table.html

notification/templates/

privacy_policy/views.py

pybb/templates/

pybb/templates/pybb/base.html

pybb/templates/pybb/feeds/posts_description.html

pybb/templates/pybb/feeds/topics_description.html

templates/404.html

templates/500.html

templates/registration/base.html

templates/search/includes/posts.html

templates/search/includes/topics.html

templates/search/search.html

threadedcomments/templates/

threadedcomments/templates/threadedcomments/preview_comment.html

wiki/templates/

wiki/templates/wiki/base.html

wiki/templates/wiki/edit.html

wiki/templates/wiki/feeds/history_description.html

wlggz/templates/

wlggz/templates/wlggz/edit_ggz.html

wlhelp/templates/

wlhelp/templates/wlhelp/base.html

wlimages/templates/

wlimages/templates/wlimages/upload.html

wlmaps/templates/

wlmaps/templates/wlmaps/base.html

wlpoll/templates/

wlpoll/templates/wlpoll/base.html

wlpoll/templates/wlpoll/poll_list.html

wlprofile/admin.py

wlprofile/context_processors.py

wlprofile/templates/

wlprofile/templates/wlprofile/base.html

wlprofile/templates/wlprofile/delete_me.html

wlprofile/templatetags/wlprofile_extras.py

wlprofile/views.py

wlscheduling/templates/

wlscheduling/templates/wlscheduling/base.html

wlscreens/templates/

wlscreens/templates/wlscreens/base.html

wlsearch/static/js/search.js

wlwebchat/templates/

wlwebchat/templates/wlwebchat/index.html

Older »