Viewing all changes in revision 62.1.8.
- Committer: Holger Rapp
- Date: 2009-03-15 17:19:34 UTC
- mto: This revision was merged to the branch mainline in revision 64.
- Revision ID: sirver@kallisto.local-20090315171934-pe2blrl8jzdi0jg7
Merged new profile support into existing code
- files added:
- mainpage/templatetags/online_users.py
- media/forum/img/en
- online_help/templates
- pybb/migrations
- templates/notification/messages_deleted
- templates/notification/messages_recovered
- templates/notification/messages_replied
- templates/notification/messages_sent
- templates/notification/wiki_article_edited
- wlrecaptcha
- files removed:
- _ops
- check_input
- check_input/management
- check_input/management/commands
- check_input/migrations
- django_messages_wl
- documentation
- documentation/management
- documentation/management/commands
- documentation/styles
- mainpage/static
- mainpage/static/img/smileys
- mainpage/static/img/socialmedia
- markdownextensions
- markdownextensions/semanticwikilinks
- media/documentation
- media/static_collected
- media/wlimages
- media/wlmaps
- media/wlmaps/maps
- media/wlprofile
- media/wlprofile/avatars
- news/migrations
- news/static
- news/static/css
- notification
- notification/management
- notification/management/commands
- notification/migrations
- notification/static
- notification/static/css
- privacy_policy
- privacy_policy/migrations
- pybb/migrations
- pybb/south_migrations
- pybb/static
- pybb/static/css
- templates/admin
- templates/admin/wiki
- templates/admin/wiki/article
- templates/check_input
- templates/notification/forum_new_post
- templates/notification/forum_new_topic
- templates/notification/maps_new_map
- templates/pagination
- templates/search
- templates/search/includes
- templates/search/indexes
- templates/search/indexes/news
- templates/search/indexes/pybb
- templates/search/indexes/wiki
- templates/search/indexes/wlhelp
- templates/search/indexes/wlmaps
- templates/star_rating
- templates/wiki/feeds
- templates/wlggz
- templates/wlhelp
- templates/wlimages/inlines
- templates/wlmaps
- templates/wlpoll
- templates/wlscheduling
- templates/wlscreens
- threadedcomments
- threadedcomments/migrations
- threadedcomments/static
- threadedcomments/static/css
- threadedcomments/templatetags
- widelandslib
- widelandslib/test
- wiki/css
- wiki/migrations
- wiki/static
- wiki/static/css
- wlevents
- wlevents/migrations
- wlevents/templatetags
- wlggz
- wlggz/migrations
- wlhelp/migrations
- wlhelp/static
- wlhelp/static/css
- wlhelp/static/js
- wlimages/migrations
- wlmaps
- wlmaps/migrations
- wlmaps/static
- wlmaps/static/css
- wlmaps/tests
- wlmaps/tests/data
- wlpoll
- wlpoll/migrations
- wlpoll/static
- wlpoll/static/js
- wlpoll/static/js/highcharts_v5
- wlpoll/templatetags
- wlprofile/migrations
- wlprofile/static
- wlprofile/static/css
- wlscheduling
- wlscheduling/management
- wlscheduling/management/commands
- wlscheduling/migrations
- wlscheduling/static
- wlscheduling/static/css
- wlscheduling/static/js
- wlscreens
- wlscreens/migrations
- wlscreens/static
- wlscreens/static/css
- wlscreens/static/lightbox_v2
- wlscreens/static/lightbox_v2/css
- wlscreens/static/lightbox_v2/images
- wlscreens/tests
- wlsearch
- wlsearch/static
- wlsearch/static/css
- wlsearch/static/js
- files renamed:
- mainpage/static/css/ => media/css/
- threadedcomments/static/css/comments.css => media/css/comments.css
- pybb/static/css/forum.css => media/css/forum.css
- news/static/css/news.css => media/css/news.css
- wlprofile/static/css/profile.css => media/css/profile.css
- wiki/static/css/wiki.css => media/css/wiki.css
- mainpage/static/favicon.ico => media/favicon.ico
- pybb/static/forum/ => media/forum/
- mainpage/static/img/ => media/img/
- mainpage/static/img/logo.png => media/img/Logo.png *
- mainpage/static/js/ => media/js/
- wlhelp/ => online_help/
- templates/wlhelp/buildings.html => online_help/templates/buildings.html
- templates/wlhelp/inlines/ => online_help/templates/inlines/
- templates/wlhelp/wares.html => online_help/templates/wares.html
- templates/news/feeds/ => templates/feeds/
- templates/wiki/feeds/history_description.html => templates/feeds/history_description.html
- templates/wiki/feeds/history_title.html => templates/feeds/history_title.html
- templates/right_boxes.html => templates/left_boxes.html
- templates/django_messages/ => templates/messages/
- templates/news/category_posts.html => templates/news/category_detail.html
- templates/notification/notice_settings.html => templates/notification/notices.html
- templates/pybb/inlines/add_post_form.html => templates/pybb/add_post_form.html
- templates/registration/activation_complete.html => templates/registration/activate.html
- files modified:
- .bzrignore
- media/forum/img/folder.png *
- media/forum/img/folder_big.png *
- media/forum/img/folder_locked_big.png *
- media/forum/img/folder_new_big.png *
- media/forum/img/folder_new_locked_big.png *
- media/img/background-4F4F4F.png *
expand all
collapse all
added
removed
documentation/styles/black20.png
documentation/styles/but1.png
documentation/styles/parchment.png
documentation/styles/wood.png
mainpage/static/img/arrow_down_short.png
mainpage/static/img/arrow_up_short.png
mainpage/static/img/black20.png
mainpage/static/img/black50.png
mainpage/static/img/but1.png
mainpage/static/img/camera.png
mainpage/static/img/delete.png
mainpage/static/img/download.png
mainpage/static/img/logo_alpha.png
mainpage/static/img/maps.png
mainpage/static/img/menu_help.png
mainpage/static/img/parchment.png
mainpage/static/img/rang_1.png
mainpage/static/img/rang_2.png
mainpage/static/img/rang_3.png
mainpage/static/img/rang_4.png
mainpage/static/img/rang_5.png
mainpage/static/img/rang_6.png
mainpage/static/img/rang_7.png
mainpage/static/img/replied.png
mainpage/static/img/smileys/face-angel.png
mainpage/static/img/smileys/face-confused.png
mainpage/static/img/smileys/face-cool.png
mainpage/static/img/smileys/face-crying.png
mainpage/static/img/smileys/face-devilish.png
mainpage/static/img/smileys/face-glasses.png
mainpage/static/img/smileys/face-grin.png
mainpage/static/img/smileys/face-kiss.png
mainpage/static/img/smileys/face-mad.png
mainpage/static/img/smileys/face-monkey.png
mainpage/static/img/smileys/face-plain.png
mainpage/static/img/smileys/face-sad.png
mainpage/static/img/smileys/face-shock.png
mainpage/static/img/smileys/face-smile-big.png
mainpage/static/img/smileys/face-smile.png
mainpage/static/img/smileys/face-surprise.png
mainpage/static/img/smileys/face-tongue.png
mainpage/static/img/smileys/face-upset.png
mainpage/static/img/smileys/face-wink.png
mainpage/static/img/socialmedia/facebook.png
mainpage/static/img/socialmedia/googleplus.png
mainpage/static/img/socialmedia/twitter.png
mainpage/static/img/socialmedia/youtube.png
mainpage/static/img/undelete.png
mainpage/static/img/up_down.png
mainpage/static/img/welcome.jpg
mainpage/static/img/wood.png
media/forum/img/en/p_delete.png
media/forum/img/en/p_edit.png
media/forum/img/en/p_quote.png
media/forum/img/en/t_new.png
media/forum/img/en/t_reply.png
media/img/1.gif
media/img/12.gif
media/img/HomepageSplash.jpg
media/img/Menubackground.png
media/img/Navbar.png
media/img/background-222.png
media/img/background-3F3F3F.png
media/img/background-444.png
media/img/background-4A4A4A.png
media/img/background.png
media/img/external_link.gif
media/img/headback.jpg
media/img/table_bottomleft.png
media/img/table_bottomright.png
media/wlprofile/anonymous.png
pybb/static/forum/img/closed.png
pybb/static/forum/img/delete.png
pybb/static/forum/img/doc_big_work.png
pybb/static/forum/img/doc_big_work_star.png
pybb/static/forum/img/edit.png
pybb/static/forum/img/folder_big_work.png
pybb/static/forum/img/folder_big_work_star.png
pybb/static/forum/img/new_topic.png
pybb/static/forum/img/open.png
pybb/static/forum/img/permalink.png
pybb/static/forum/img/permalink_hover.png
pybb/static/forum/img/preview.png
pybb/static/forum/img/quote.png
pybb/static/forum/img/send.png
pybb/static/forum/img/send_pm.png
pybb/static/forum/img/sticky.png
pybb/static/forum/img/subscribe.png
pybb/static/forum/img/top.png
pybb/static/forum/img/topic_hide.png
pybb/static/forum/img/topic_show.png
pybb/static/forum/img/unstick.png
pybb/static/forum/img/unsubscribe.png
wlscreens/static/lightbox_v2/images/close.png
wlscreens/static/lightbox_v2/images/loading.gif
wlscreens/static/lightbox_v2/images/next.png
wlscreens/static/lightbox_v2/images/prev.png
