Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands
Looks like the metal workshop 'hangs', it always shows 'The Economy doesn't need the ware Bradpaddle', although the game run more than 5 Minutes. -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Finally this is productive now :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands
got another detour assert: /widelands-repo/new-shipping/src/economy/fleet.cc:890: void Widelands::Fleet::check_push_destination(Widelands::Game&, Widelands::Ship&, const Widelands::PortDock&, Widelands::PortDock&, uint32_t): Zusicherung »detour >= base_length« nicht erfüllt. Abgebrochen (Speicherabzug geschrieben) The assert is triggert close after loading this save game: https://bugs.launchpad.net/widelands/+bug/1827033/+attachment/5285703/+files/wl_autosave_00.wgf Don't know if it is related: Playing a debug build and the game stutters noticeably. The game stops for a short time. Do you want a save game close before this autosave? -- https://code.launchpad.net/~widelands-dev/widelands/new-shipping/+merge/371155 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-shipping. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Manx thanks :) I wait only for janus to approve the changes regarding python3. He will look at it next weekend. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands
I get some text conflicts when merging trunk. Benedikt, can look into this and make the call for merging? -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/new-shipping into lp:widelands
Can you please merge trunk? I am struggling with bug 1839740 ... which is solved in trunk. I get the same crash: /widelands-repo/new-shipping/src/economy/fleet.cc:888: void Widelands::Fleet::check_push_destination(Widelands::Game&, Widelands::Ship&, const Widelands::PortDock&, Widelands::PortDock&, uint32_t): Zusicherung »detour >= base_length« nicht erfüllt. The crash happens after at least one ship arrives a port. I guess its the ship called 'Saturn' in this savgame: https://bugs.launchpad.net/widelands/+bug/1827033/+attachment/5285464/+files/test.wgf Just press 'E' and click on 'Saturn' -- https://code.launchpad.net/~widelands-dev/widelands/new-shipping/+merge/371155 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/new-shipping. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands
Will it be problem if the AI can't handle ferrys? Need this branch more testing? -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Finally i got it (hopefully) Please check again on alpha... https://alpha.widelands.org/ -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Review: Needs Fixing Thanks :-) But the check for clamdscan doesn't work on the server... i know why, but i don't know the underlying cause. Will talk on IRC about that issue when i have some more time. Just found that map uploading is broken with the changes in this branch. So the code for map uploading needs adapting too... -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
@Toni: Can we have the package 'clamdscan' installed? For some reason it is a recommended package for clamd and we do not install recommended packages by default. Or is clamd configured to have on-access-scanning enabled? Didn't saw that it is configured like that. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
> I also wonder whether we should disallow map files - it might come in handy > if somebody wants some feedback before publishing to the maps section. I just don't want to have map files in the forum. I 'fear' most (new) users will upload a map in the forum instead in the 'right' place. A Feedback can also be done in the map comments, or by linking a map in the forum and ask there for a feedback. Once there is a fix for bug 357914 'Allow submitters of maps to upload new versions' get implement, it should be fine to not allow maps in forum. But of course we can remove that part of code and if we get in trouble we can add it again. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
stonerl, can you install and configure clamav on the server, please? The current branch implemented a check with clamdscan, which needs a clamav daemon. We can also stick with clamscan, which can be run on demand, but this much slow: A file check last 55 sec. on my machine, whereas clamdscan usually needs only 0,1 sec. The current branch is not running on alpha, yet. Since i am afk for some some days, i'll shut down alpha now. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
Thanks, for testing :) Updated the media branch with the blend file and fraangs license. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
Review: Resubmit Sorry didn't applied the init.lua files sent by fraang, because they have changed in the meantime. The values are now taken from fraang, but i edited the main init.lua files from trunk. Looks good now imho. fraang had also changed the animate program for cornfield_ripe and applied a value of 45000. The result was that some ripe filed vanished without harvesting. So i leave the value from trunk and it seems to be correct. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/atlanteans_cornfield. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
Just a reminder for me: Don't forget to update the media repo in case this get merged. -- https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
kaputtnik has proposed merging lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands. Commit message: New cornfield images for atlanteans by fraang Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/atlanteans_cornfield/+merge/371209 See: https://www.widelands.org/forum/topic/4406/ I have created the menu.png from idle_00.png by resizing. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands. === modified file 'data/tribes/immovables/cornfield/harvested/idle_00.png' Binary files data/tribes/immovables/cornfield/harvested/idle_00.png 2019-03-30 06:46:25 + and data/tribes/immovables/cornfield/harvested/idle_00.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_01.png' Binary files data/tribes/immovables/cornfield/harvested/idle_01.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_01.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_02.png' Binary files data/tribes/immovables/cornfield/harvested/idle_02.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_02.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_03.png' Binary files data/tribes/immovables/cornfield/harvested/idle_03.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_03.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/harvested/idle_04.png' Binary files data/tribes/immovables/cornfield/harvested/idle_04.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/harvested/idle_04.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/harvested/menu.png' Binary files data/tribes/immovables/cornfield/harvested/menu.png 2019-05-29 09:02:33 + and data/tribes/immovables/cornfield/harvested/menu.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/medium/idle_00.png' Binary files data/tribes/immovables/cornfield/medium/idle_00.png 2019-03-30 06:46:25 + and data/tribes/immovables/cornfield/medium/idle_00.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_01.png' Binary files data/tribes/immovables/cornfield/medium/idle_01.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_01.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_02.png' Binary files data/tribes/immovables/cornfield/medium/idle_02.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_02.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_03.png' Binary files data/tribes/immovables/cornfield/medium/idle_03.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_03.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/medium/idle_04.png' Binary files data/tribes/immovables/cornfield/medium/idle_04.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/medium/idle_04.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/medium/menu.png' Binary files data/tribes/immovables/cornfield/medium/menu.png 2019-05-29 09:02:33 + and data/tribes/immovables/cornfield/medium/menu.png 2019-08-12 15:56:05 + differ === modified file 'data/tribes/immovables/cornfield/ripe/idle_00.png' Binary files data/tribes/immovables/cornfield/ripe/idle_00.png 2019-03-30 06:46:25 + and data/tribes/immovables/cornfield/ripe/idle_00.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_01.png' Binary files data/tribes/immovables/cornfield/ripe/idle_01.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_01.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_02.png' Binary files data/tribes/immovables/cornfield/ripe/idle_02.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_02.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_03.png' Binary files data/tribes/immovables/cornfield/ripe/idle_03.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_03.png 2019-08-12 15:56:05 + differ === added file 'data/tribes/immovables/cornfield/ripe/idle_04.png' Binary files data/tribes/immovables/cornfield/ripe/idle_04.png 1970-01-01 00:00:00 + and data/tribes/immovables/cornfield/ripe/idle_04.png 2019-08-12 15:5
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis_xenial into lp:widelands
Is this a valid proposal right now? I not, can you please delete the merge proposal? -- https://code.launchpad.net/~widelands-dev/widelands/travis_xenial/+merge/368237 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_xenial into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Review: Resubmit I have to stop working on this, other wise i fear to change many other things :-D Anyway i think this works. wai files need some special treatment though. Please test on alpha: https://alpha.widelands.org/ -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
> Other extensions that we're using for Widelands & that might be interesting: > .wai - AI Ok > .wmf - Map I forgot to mention: If the extension is wmf, an errormessage is shown: "This seems to be a widelands map file. Please upload it at our maps section." > .wrpl - Replay - useless with the accompanying .wgf though. I am planning to make a wikipage describing, beside other things, the usage of replays, e.g. they have to be zipped together before uploading and link that wikipage in the upload form. But i have to check for .wrpl.wgf. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
I am a bit lost here... Some checks are made now, but i am unsure if we need them all. What is implemented: 1. Link of Attachment: If a user clicks on a link of an attachment, he will be ever prompted for a download (or to open the file with an associated program), even if it is a file which the browser may can display, e.g. an image (png, jpg) or text file. This is not optimal, but i think it is more secure. 2. Restricting upload permission A user has only permission to upload files, if he has had written 5 posts prior. The number of 5 derives from MAX_HIDDEN_POST at the moment, but i think it's better to have an own value for this. What number do we want? 3. Allowed extensions: Added a list: ALLOWED_EXTENSIONS = ['wgf', 'jpg', 'jpeg', 'gif', 'png', 'ogg', 'lua', 'ods', 'zip', 'json', 'txt', 'csv'] I am unsure if this list will be ever complete. E.g. some may want to upload some other types of files (e.g. py, odg, doc, ...) 4. Extension handling: - Files without extension aren't allowed (can be problematic e.g. with the campvis file) - For 'wgf' files: Check if some base entries can be found (e.g. '/binary/' or '/minimap.png') - For image files: Check if this is really an image using the Pillow library. This finds corrupted .png but not corrupted .jpg Do we need a check for each allowed extension? 5. Comparing Mime-Types: When uploading a file, a Mime-Type (content-type) is also submitted. The submitted mime-type is mostly derived from the extension of the file. E.g. if you rename a file from 'image.png' to 'image.txt' the OS (or browser) sends the Mime-type 'text/plain', which is obviously wrong. To prevent such mime-type mismatch, a check is made which compares the sent mime-type with the mime-type derived from python-magic. e.g. python magic will show for 'image.txt' the mime-type 'image/png'. As said, i am a bit lost, not really knowing if we need all this checks, or if they are enough at all :-S Any opinions? -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/toc_to_latest_posts into lp:widelands-website
Thanks :-) merged and deployed -- https://code.launchpad.net/~widelands-dev/widelands-website/toc_to_latest_posts/+merge/370906 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/toc_to_latest_posts into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/toc_to_latest_posts into
lp:widelands-website.
Commit message:
Add a toc to latest posts view
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/toc_to_latest_posts/+merge/370906
The TOC contain all topics (when sorted by topic) or Forum/Topics (when sorted
by forum).
I have prepared the alpha site for testing:
https://alpha.widelands.org/forum/latest_posts/?days=1000&sort_by=forum
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/toc_to_latest_posts into
lp:widelands-website.
=== modified file 'pybb/templates/pybb/all_last_posts.html'
--- pybb/templates/pybb/all_last_posts.html 2019-03-20 21:19:12 +
+++ pybb/templates/pybb/all_last_posts.html 2019-08-02 09:43:21 +
@@ -1,5 +1,12 @@
{% extends 'pybb/base.html' %}
+{% load static %}
+
+{% block extra_head %}
+
+{{block.super}}
+{% endblock %}
+
{% block title %}
Latest posts - {{ block.super }}
{% endblock title %}
@@ -30,44 +37,70 @@
{% endif %}
-
-
-{% if sort_by == 'topic' %}
- {% for topic, posts in object_list.items %}
-Topic: {{ topic }}
-
- At Forum:
- {{ topic.forum }}
-
-{% include 'pybb/inlines/latest_posts_table.html'%}
- {% endfor %}
-
-{% else %} {# sort by forum #}
- {% for forum, topics in object_list.items %}
-Forum: {{ forum }}
-
-
-
- Topic{{ topic_list|length|pluralize }}
- Post{{ posts|length|pluralize }}
-
-
-
-{% for topic, posts in topics.items %}
-
-
- {{ topic }}
-
-
- {% include 'pybb/inlines/latest_posts_table.html'%}
-
+
+
+
+ {% if sort_by == 'topic' %}
+Topic{{ object_list|length|pluralize }}
+
+ {% for topic in object_list %}
+{{ topic }}
+ {% endfor %}
+
+ {% else %}
+Forum/Topic{{ object_list|length|pluralize }}
+
+ {% for forum, topics in object_list.items %}
+{# no access to forum.pk here #}
+{{ forum }}
+
+ {% for topic in topics %}
+{{ topic }}
+ {% endfor %}
+
+
+ {% endfor %}
+
+{% endif %}
+
+
+
+{% if sort_by == 'topic' %}
+ {% for topic, posts in object_list.items %}
+Topic: {{ topic }}
+
+At Forum:
+{{ topic.forum }}
+
+{% include 'pybb/inlines/latest_posts_table.html'%}
+ {% endfor %}
+{% else %} {# sort by forum #}
+ {% for forum, topics in object_list.items %}
+ Forum: {{ forum }}
+
+
+
+Topic{{ topic_list|length|pluralize }}
+Post{{ posts|length|pluralize }}
-{% endfor %}
-
-
- {% empty %}
-Sorry, no posts found...
- {% endfor %}
-{% endif %}
+
+
+ {% for topic, posts in topics.items %}
+
+
+{{ topic }}
+
+
+{% include 'pybb/inlines/latest_posts_table.html'%}
+
+
+ {% endfor %}
+
+
+{% empty %}
+ Sorry, no posts found...
+{% endfor %}
+{% endif %}
+
{% endblock %}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
Currently there is no restriction on file types. The problem is that a file may not contain what the extension says it should be. Everyone can rename 'image.js' into 'image.png'... A list of allowed extension do not suffer. I'll try to implement some checks for validating a files type and probably an 'allowed extension list'. What about restricting uploads to users who have written x posts prior? From my side this can be implemented. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/sitemap_https into lp:widelands-website
This is online now: https://www.widelands.org/sitemap.xml/ -- https://code.launchpad.net/~widelands-dev/widelands-website/sitemap_https/+merge/370398 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc9 into lp:widelands
Didn't we need to adapt the travis/appveyor configuration? I am unfamiliar with those configuration, so i didn't proposed the merge... -- https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc9 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/move_maps_minimap into lp:widelands-website
Thanks :-) Merged and deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/move_maps_minimap/+merge/370039 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/sitemap_https into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/sitemap_https into lp:widelands-website. Commit message: sitemap.xml: explicitly set protocol to https Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1836507 in Widelands Website: "sitemap.xml" https://bugs.launchpad.net/widelands-website/+bug/1836507 For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/sitemap_https/+merge/370398 See commit message -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/sitemap_https into lp:widelands-website. === modified file 'mainpage/static_sitemap.py' --- mainpage/static_sitemap.py 2019-03-31 11:08:21 + +++ mainpage/static_sitemap.py 2019-07-20 08:54:35 + @@ -5,6 +5,7 @@ class StaticViewSitemap(Sitemap): priority = 0.5 changefreq = 'yearly' +protocol = 'https' def items(self): return ['mainpage', 'changelog'] === modified file 'news/sitemap.py' --- news/sitemap.py 2016-12-13 18:28:51 + +++ news/sitemap.py 2019-07-20 08:54:35 + @@ -7,6 +7,7 @@ class NewsSitemap(Sitemap): changefreq = 'never' priority = 0.5 +protocol = 'https' def items(self): start_date = datetime.today() - timedelta(days=365 * 2) === modified file 'pybb/sitemap.py' --- pybb/sitemap.py 2016-11-04 08:07:18 + +++ pybb/sitemap.py 2019-07-20 08:54:35 + @@ -5,6 +5,7 @@ class ForumSitemap(Sitemap): changefreq = 'monthly' priority = 0.5 +protocol = 'https' def items(self): return Forum.objects.all() === modified file 'wiki/sitemap.py' --- wiki/sitemap.py 2016-11-04 08:07:18 + +++ wiki/sitemap.py 2019-07-20 08:54:35 + @@ -5,6 +5,7 @@ class WikiSitemap(Sitemap): changefreq = 'yearly' priority = 0.5 +protocol = 'https' def items(self): return Article.objects.all() === modified file 'wlhelp/sitemap.py' --- wlhelp/sitemap.py 2016-11-05 15:46:26 + +++ wlhelp/sitemap.py 2019-07-20 08:54:35 + @@ -5,6 +5,7 @@ class WlHelpTribeSitemap(Sitemap): changefreq = 'yearly' priority = 0.5 +protocol = 'https' def items(self): return Tribe.objects.all() @@ -16,6 +17,7 @@ class WlHelpBuildingSitemap(Sitemap): changefreq = 'yearly' priority = 0.5 +protocol = 'https' def items(self): return Building.objects.all() @@ -27,6 +29,7 @@ class WlHelpWareSitemap(Sitemap): changefreq = 'yearly' priority = 0.5 +protocol = 'https' def items(self): return Ware.objects.all() @@ -38,6 +41,7 @@ class WlHelpWorkerSitemap(Sitemap): changefreq = 'yearly' priority = 0.5 +protocol = 'https' def items(self): return Worker.objects.all() ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands
Looks good now. Thanks to Dirk Stöcker for the fix. I don't think this needs a code review: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug_1836107_lGL/+merge/370334 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands has been updated. Commit message changed to: Link GL libraries insted of setting flags. Fixes appveyor failures due to missing lbpdcurses.dll For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug_1836107_lGL/+merge/370334 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands
r9166 according to https://www.widelands.org/forum/post/29015/ -- https://code.launchpad.net/~widelands-dev/widelands/bug_1836107_lGL/+merge/370334 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website.
Commit message:
Allow attachments in the forum
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #964452 in Widelands Website: "Suggestion: Allow uploads to the site"
https://bugs.launchpad.net/widelands-website/+bug/964452
Bug #1833658 in Widelands Website: "Create a possibility to upload tournament
replay"
https://bugs.launchpad.net/widelands-website/+bug/1833658
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/+merge/370342
Made attachments python3 compatible:
https://bazaar.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/revision/545
Set allowed file size to 5 Mb (as we have for nginx)
Delete attachment when deleting a post:
https://bazaar.launchpad.net/~widelands-dev/widelands-website/pybb_attachments/revision/548
Added template for showing attachments.
Style tweaks, example:
https://bugs.launchpad.net/widelands-website/+bug/964452/+attachment/5277903/+files/attachments_1.png
Autoreload css for the users if this got merged, so the users don't have to hit
CTRL+F5
I'll do some explanations in the wiki and announce this change. Probably with
the option to remove it again if we get too many problematic attachments.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/pybb_attachments into lp:widelands-website.
=== modified file 'mainpage/settings.py'
--- mainpage/settings.py 2019-04-11 16:11:21 +
+++ mainpage/settings.py 2019-07-18 20:25:31 +
@@ -191,7 +191,8 @@
# Pybb Configuration #
##
# See also pybb defaults in pybb.settings.py
-PYBB_ATTACHMENT_ENABLE = False # disable gzip middleware when enabling attachments
+PYBB_ATTACHMENT_ENABLE = True
+PYBB_ATTACHMENT_SIZE_LIMIT = 1024*1024*5 #5MB
PYBB_DEFAULT_MARKUP = 'markdown'
INTERNAL_PERM='pybb.can_access_internal' # The permission string derived from pybb.models.category
=== modified file 'pybb/forms.py'
--- pybb/forms.py 2019-03-20 21:32:32 +
+++ pybb/forms.py 2019-07-18 20:25:31 +
@@ -1,6 +1,6 @@
import re
from datetime import datetime
-import os.path
+import os
from django import forms
from django.conf import settings
@@ -69,9 +69,15 @@
name=memfile.name, post=post)
dir = os.path.join(settings.MEDIA_ROOT,
pybb_settings.ATTACHMENT_UPLOAD_TO)
-fname = '%d.0' % post.id
+if not os.path.exists(dir):
+os.makedirs(dir)
+
+fname = '{}.0'.format(post.id)
path = os.path.join(dir, fname)
-file(path, 'w').write(memfile.read())
+
+with open(path, 'wb') as f:
+f.write(memfile.read())
+
obj.path = fname
obj.save()
=== modified file 'pybb/models.py'
--- pybb/models.py 2019-04-11 15:20:33 +
+++ pybb/models.py 2019-07-18 20:25:31 +
@@ -345,6 +345,11 @@
def delete(self, *args, **kwargs):
self_id = self.id
head_post_id = self.topic.posts.order_by('created')[0].id
+
+if self.attachments.all():
+for attach in self.attachments.all():
+attach.delete()
+
super(Post, self).delete(*args, **kwargs)
self.topic.save()
@@ -398,7 +403,7 @@
super(Attachment, self).save(*args, **kwargs)
if not self.hash:
self.hash = hashlib.sha1(
-str(self.id) + settings.SECRET_KEY).hexdigest()
+str(self.id).encode('utf-8') + settings.SECRET_KEY.encode('utf-8')).hexdigest()
super(Attachment, self).save(*args, **kwargs)
def __str__(self):
@@ -407,19 +412,13 @@
def get_absolute_url(self):
return reverse('pybb_attachment', args=[self.hash])
-def size_display(self):
-size = self.size
-if size < 1024:
-return '%b' % size
-elif size < 1024 * 1024:
-return '%dKb' % int(size / 1024)
-else:
-return '%.2fMb' % (size / float(1024 * 1024))
-
def get_absolute_path(self):
return os.path.join(settings.MEDIA_ROOT, pybb_settings.ATTACHMENT_UPLOAD_TO,
self.path)
+def delete(self, *args, **kwargs):
+os.remove(self.get_absolute_path())
+super(Attachment, self).delete(*args, **kwargs)
if notification is not None:
signals.post_save.connect(notification.handle_observations, sender=Post)
=== modified file 'pybb/static/css/forum.css'
--- pybb/static/css/forum.css 2019-02-28 16:09:16 +
+++ pybb/static/css/forum.css 2019-07-18 20:25:31 +
@@ -132,6 +132,
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1836107_lGL into
lp:widelands.
Commit message:
Link GL libraries insted of setting flags
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1836107 in widelands: "Build order for -lGL does not work for openSUSE
Tumbleweed"
https://bugs.launchpad.net/widelands/+bug/1836107
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug_1836107_lGL/+merge/370334
See https://bugs.launchpad.net/widelands/+bug/1836107
One should may apply a better commit message ;)
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2019-06-15 09:13:13 +
+++ CMakeLists.txt 2019-07-18 17:54:01 +
@@ -182,7 +182,7 @@
# This is set to avoid linker errors when using GLVND-libs on Linux
if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
+ link_libraries("GL")
add_compile_definitions(WL_USE_GLVND)
message(STATUS "Adding linker flags for GLVND.")
endif()
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/move_maps_minimap into lp:widelands-website
Review: Resubmit A better solution: Using signals, especially when deleting files, can lead into some sideeffects. So i have implemented a custom delete() function which is much better, imho. -- https://code.launchpad.net/~widelands-dev/widelands-website/move_maps_minimap/+merge/370039 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/move_maps_minimap into lp:widelands-website
Review: Needs Fixing I have to test a bit more before merging this. On my second computer i get some errors after merging this branch. -- https://code.launchpad.net/~widelands-dev/widelands-website/move_maps_minimap/+merge/370039 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website
Merged and deployed -- https://code.launchpad.net/~widelands-dev/widelands-website/update_third_party_2019/+merge/369747 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/move_maps_minimap into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/move_maps_minimap into lp:widelands-website.
Commit message:
Move minimaps to wlmaps/minimaps
Implemented the new value needs_version_after
Delete map files (.wmf and .png) when deleting a map from the database
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1751244 in Widelands Website: "Deleting a map over the admin page does
not delete the underlying files"
https://bugs.launchpad.net/widelands-website/+bug/1751244
Bug #1833662 in Widelands Website: "Better handling of 'This map requires
widelands Version >x'"
https://bugs.launchpad.net/widelands-website/+bug/1833662
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/move_maps_minimap/+merge/370039
The maps minimaps are now moved to wlmaps/minimaps. This fixes also creating a
faulty path in the database for the minimaps (beginning with a slash).
Deleting a map does now delete the related files.
The new value of 'needs_version_after' produced by wl_map_info is now
considered. There is now an inline html file for this, so the logic is in one
file.
The changes related to minimaps need manual intervention regarding the files
and the database entries:
- All png files in MEDIA_ROOT/wlmaps/maps/ needs moving to
MEDIA_ROOT/wlmaps/minimaps/
- Database entries for minimaps need to be changed from
'/wlmaps/maps/NAME.png'
to
'wlmaps/minimaps/NAME.png'
To get this in:
- set maintenance
- backup the database
- backup the files from MEDIA_ROOT/wlmaps/
- run ./manage.py migrate
- move the png files
- correct the path(s) in the database. I want to change also some bad entries
for the mapfiles. With activated virtualenvironment:
./manage.py shell
from wlmaps.models import Map
maps = Map.objects.all()
for m in maps:
if m.minimap.name.startswith('/'):
new_name = m.minimap.name.rpartition('/')[2]
m.minimap = 'wlmaps/minimaps/{}'.format(new_name)
m.save()
maps = Map.objects.all()
for m in maps:
if m.file.name.startswith('/var/www'):
new_name = m.file.name.rpartition('/')[2]
m.file = 'wlmaps/maps/{}'.format(new_name)
m.save()
This can maybe done also in one loop (changing minimap and file), but i fear
saving an object twice in one loop can be problematic, although at home it
works nicely.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/move_maps_minimap into lp:widelands-website.
=== modified file 'wlmaps/forms.py'
--- wlmaps/forms.py 2019-03-31 11:08:21 +
+++ wlmaps/forms.py 2019-07-12 09:03:11 +
@@ -11,6 +11,8 @@
from wlmaps.models import Map
import os
+import shutil
+
class UploadMapForm(ModelForm):
"""
@@ -59,8 +61,8 @@
os.chdir(settings.WIDELANDS_SVN_DIR)
check_call(['wl_map_info', saved_file])
-# TODO(shevonar): delete file because it will be saved again when
-# the model is saved. File should not be saved twice
+# Deleting the file because it will be saved again when
+# the model is saved.
default_storage.delete(saved_file)
os.chdir(old_cwd)
except CalledProcessError:
@@ -86,11 +88,18 @@
self.instance.descr = mapinfo['description']
self.instance.hint = mapinfo['hint']
self.instance.world_name = mapinfo['world_name']
+self.instance.wl_version_after = mapinfo['needs_widelands_version_after']
-# mapinfo["minimap"] is an absolute path.
-# We partition it to get the correct file path
-minimap_path = mapinfo['minimap'].partition(settings.MEDIA_ROOT)[2]
-self.instance.minimap = '/' + minimap_path
+# mapinfo["minimap"] is the absolute path containing the path where it
+# is saved, extract the name
+minimap_name = mapinfo['minimap'].rpartition('/')[2]
+minimap_upload_to = self.instance._meta.get_field('minimap').upload_to
+# Set the destination relative to MEDIA_ROOT
+minimap_path = os.path.join(minimap_upload_to, minimap_name)
+self.instance.minimap = minimap_path
+# Move the minimap file (.png) from wlmaps/maps to wlmaps/minimaps
+shutil.move(mapinfo['minimap'], os.path.join(
+settings.MEDIA_ROOT, minimap_path))
# the json file is no longer needed
default_storage.delete(saved_file + '.json')
=== added file 'wlmaps/migrations/0003_auto_20190712_0928.py'
--- wlmaps/migrations/0003_auto_20190712_0928.py 1970-01-01 00:00:00 +
+++ wlmaps/migrations/0003_auto_20190712
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website has been updated. Description changed to: Security release for Django: https://www.djangoproject.com/weblog/2019/jul/01/security-releases/ Because i was on it, i have also updated all other apps. Two packages removed, because i can't find any reference to them: untokenize pyparsing The change in create_docs (using os.path.lexists instead of exists) fixes an issue if the link is broken (os.path.exists returns False then). To get this in: - set maintenance: systemctl stop wl-website - pip install -r pip requirements.txt - unset maintenance: systemctl start wl-website - pip uninstall untokenize pyparsing For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/update_third_party_2019/+merge/369747 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website. Commit message: Update third party apps Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/update_third_party_2019/+merge/369747 Security release for Django: https://www.djangoproject.com/weblog/2019/jul/01/security-releases/ Because i was on it, i have also updated all other apps. Two packages removed, because i can't find any reference to them: untokenize pyparsing The change in create_docs (using os.path.lexists instead of exists) fixes an issue if the link is broken (os.path.exists returns False then). To get this in: - set maintenance: systemctl start wl-bauarbeiten - pip install -r pip requirements.txt - unset maintenance: systemctl start wl-website - pip uninstall untokenize pyparsing -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/update_third_party_2019 into lp:widelands-website. === modified file 'documentation/management/commands/create_docs.py' --- documentation/management/commands/create_docs.py 2019-04-11 15:06:09 + +++ documentation/management/commands/create_docs.py 2019-07-05 07:13:44 + @@ -55,7 +55,7 @@ # only needed on first run os.mkdir(target_dir) -if os.path.exists(link_name): +if os.path.lexists(link_name): # only needed if this script has already run os.remove(link_name) === modified file 'pip_requirements.txt' --- pip_requirements.txt 2019-03-06 16:37:05 + +++ pip_requirements.txt 2019-07-05 07:13:44 + @@ -1,27 +1,25 @@ -# Python requirements for widelands-website at 22.06.2017 +# Python requirements for widelands-website at July 2019 beautifulsoup4==4.7.1 bleach==3.1.0 -Django==1.11.20 +Django==1.11.22 django-haystack==2.8.1 # django-messages is very old on pypi # Do not install newer versions because our notifications app is affected -e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages django-nocaptcha-recaptcha==0.0.20 -django-star-ratings==0.7.0 +django-star-ratings==0.8.0 dj-pagination==2.4.0 -django-registration==3.0 +django-registration==3.0.1 django-tagging==0.4.6 gunicorn==19.9.0 lxml==4.3.2 -Markdown==3.0.1 +Markdown==3.1.1 mysqlclient==1.4.2.post1 -numpy==1.16.2 -Pillow==5.4.1 +numpy==1.16.4 +Pillow==6.1.0 pydot==1.4.1 -pyparsing==2.3.1 -Sphinx==1.8.4 -untokenize==0.1.1 +Sphinx==2.1.2 Whoosh==2.7.4 # Automatically installed dependencies ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduler_utc_fix into lp:widelands-website
OK, this is merged and deployed now. Users may have to press CTRL+F5 to reload the js. Thanks for the fix :-) -- https://code.launchpad.net/~trimardio/widelands-website/scheduler_utc_fix/+merge/369479 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduler_utc_fix into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduler_utc_fix into lp:widelands-website
Looks good so far :) +1 for renaming the function! Can you please also take care of the '2 hours problem' which i reported in the forum? I guess it's caused by the js_offset in line 205?: https://bazaar.launchpad.net/~trimardio/widelands-website/scheduler_utc_fix/view/head:/wlscheduling/static/js/scheduling.js#L205 -- https://code.launchpad.net/~trimardio/widelands-website/scheduler_utc_fix/+merge/369479 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduler_utc_fix into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website
Yes, my approach does not work on the server. Not really sure why, but i guess its because the website runs with 4 gunicorn workers, whereas at home there is only one process involved. Thanks for testing again :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/quiz_captcha/+merge/369213 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website
I didn't messed it up, i just restarted wl-alpha which doesn't work, i had to stop wl-alpha and start it from from scratch, so that nginx is reloaded also. Anyway there is an issue which only appears in production: I want to not show the question which was shown previously if a wrong answer was given. This do not work in production, whereas it works nicely locally. Has to be investigated... -- https://code.launchpad.net/~widelands-dev/widelands-website/quiz_captcha/+merge/369213 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website
Ups, sorry, looks like i have messed it up. -- https://code.launchpad.net/~widelands-dev/widelands-website/quiz_captcha/+merge/369213 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/quiz_captcha
into lp:widelands-website.
Commit message:
Add a quiz captcha to https://www.widelands.org/legal_notice/ to prevent spam
mails
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1799375 in Widelands Website: "Stop spam coming over legal_notice"
https://bugs.launchpad.net/widelands-website/+bug/1799375
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/quiz_captcha/+merge/369213
Added a new app called quiz_captcha and implemented it in
https://www.widelands.org/legal_notice/
A quiz is a question/answer pair, set through the admin interface. If the
answer don't match the question, a form error is triggered and a new question
will be shown.
Testing can be done on alpha, i have set 4 questions:
https://alpha.widelands.org/legal_notice/
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/quiz_captcha into lp:widelands-website.
=== modified file 'mainpage/forms.py'
--- mainpage/forms.py 2019-03-03 15:17:58 +
+++ mainpage/forms.py 2019-06-23 18:35:44 +
@@ -4,7 +4,8 @@
from django import forms
from django_registration.forms import RegistrationForm
from nocaptcha_recaptcha.fields import NoReCaptchaField
-from wlprofile.models import Profile as wlprofile
+#from wlprofile.models import Profile as wlprofile
+from quiz_captcha.fields import QuizField
# Overwritten form to include a captcha
@@ -18,3 +19,4 @@
forename = forms.CharField(max_length=80, required=False)
email = forms.EmailField()
inquiry = forms.CharField(widget=forms.Textarea)
+quiz = QuizField()
\ No newline at end of file
=== modified file 'mainpage/settings.py'
--- mainpage/settings.py 2019-04-11 16:11:21 +
+++ mainpage/settings.py 2019-06-23 18:35:44 +
@@ -106,6 +106,7 @@
'documentation',
'privacy_policy.apps.PrivacyPolicyConfig',
'haystack', # search engine; see option HAYSTACK_CONNECTIONS
+'quiz_captcha',
# Modified 3rd party apps
'wiki.apps.WikiConfig', # This is based on wikiapp, but has some local modifications
=== modified file 'mainpage/templates/mainpage/legal_notice.html'
--- mainpage/templates/mainpage/legal_notice.html 2019-01-24 18:03:54 +
+++ mainpage/templates/mainpage/legal_notice.html 2019-06-23 18:35:44 +
@@ -23,44 +23,45 @@
E-Mail Holger Rapp: sirver(at)gmx.de
Contact form. Using this form sends E-Mails to following person(s):
-
-{% for name, recipient in inquiry_recipients %}
-{{ name }}: {{ recipient }}
-{% endfor %}
-
+
+ {% for name, recipient in inquiry_recipients %}
+ {{ name }}: {{ recipient }}
+ {% endfor %}
+
- {% csrf_token %}
-
-
- First name (optional):
-
-
-
- Last name (optional):
-
-
-
- Email:
-
-{% for error in form.email.errors %}
- {{ error }}
-{% endfor %}
-
-
-
- Inquiry: {{ form.inquiry.errors }}
-
-{% for error in form.inquiry.errors %}
- {{ error }}
-{% endfor %}
-
-
-
-
-
-
-
-
+
+ {% csrf_token %}
+
+
+ First name (optional):
+ {{ form.forename }}
+
+
+ Last name (optional):
+ {{ form.surname }}
+
+
+ Email:
+ {{ form.email }}
+ {% for error in form.email.errors %}
+ {{ error }}
+ {% endfor %}
+
+
+
+ Inquiry:
+ {{ form.inquiry }}
+ {% for error in form.inquiry.errors %}
+ {{ error }}
+ {% endfor %}
+
+
+
+ {% include "quiz_captcha/quest.html" %}
+
+
+
+
=== modified file 'mainpage/views.py'
--- mainpage/views.py 2019-06-07 20:25:05 +
+++ mainpage/views.py 2019-06-23 18:35:44 +
@@ -19,6 +19,7 @@
def legal_notice(request):
"""The legal notice page to fullfill law."""
+
if request.method == 'POST':
form = ContactForm(request.POST)
if form.is_valid():
@@ -41,8 +42,13 @@
# Redirect after POST
return HttpResponseRedirect('/legal_notice_thanks/')
-else:
+else: # form is not valid
+# assign new values to the quiz field
+form.fields['quiz'].init_values()
+
+else: # request.GET
form = ContactForm() # An unbound form
+form.fields['quiz'].init_values()
return render(request, 'mainpage/legal_notice.html', {
'form': form,
=== added directory 'quiz_captcha'
=== added file 'quiz_captcha/__init__.py'
=== added file 'quiz_captcha/admin.py'
--- quiz_captcha/admin.py 1970-01-01 00:00:00 +
+++ quiz_captcha/admin.py 2019-06-23 18:35:44 +
@@ -0,0 +1,10 @@
+# -*- codin
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/update_ops_script into lp:widelands-website
Since this is used by Sirver, he should decide if the 'fix' works or not and if he want more control or not. @SirVer: Do you want me to merge this once it is ready? -- https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlwebsite_py36 into lp:widelands-website
Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/wlwebsite_py36/+merge/368589 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/atlantean_fishbreeder into lp:widelands
Please do not add me as a reviewer. Just leave the entry as it is when proposing a merge request. Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/atlantean_fishbreeder/+merge/368442 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/atlantean_fishbreeder into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/workarea-fixes into lp:widelands
ok, ok :-) Sorry for the noise. Will be quiet now. -- https://code.launchpad.net/~widelands-dev/widelands/workarea-fixes/+merge/368342 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/workarea-fixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/workarea-fixes into lp:widelands
While i am not convinced by this feature at all, i agree with Gun. The lua files are already full of tables and options, which make it hard to understand for beginners (modders). On the other side: Is it worth the work for a feature - which is hard to explain - which was wanted by a single player - were other players know how to handle the 'problem' without this feature -- https://code.launchpad.net/~widelands-dev/widelands/workarea-fixes/+merge/368342 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/workarea-fixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_context_selection into lp:widelands
Will do next weekend :-) -- https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_context_selection. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_context_selection into lp:widelands
Should this be tested some how or are the Travis/Appveyor builds enough testing? -- https://code.launchpad.net/~widelands-dev/widelands/fix_context_selection/+merge/368238 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_context_selection into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827033-shipping-algorithm into lp:widelands
This behavior applies also for workers (soldiers), as mentioned in the bug report at #3 (4. paragraph) and comment #6 (replay). Lets have this then and create another bug report? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827033-shipping-algorithm/+merge/366959 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1827033-shipping-algorithm. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827033-shipping-algorithm into lp:widelands
> no unusual behaviour was observed in shipping so far. I think it is very unusual that a ship navigate to a port, unload all wares and immediately load the same wares again to navigate the wares to the destination port. In the end this means the time a ware is transported will grow with the number of ports. Shouldn't the question be: Does the new shipping algorithm add any features? But i agree that this bug should fixed very soon. Test games on seafaring maps makes no fun until this is fixed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827033-shipping-algorithm/+merge/366959 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1827033-shipping-algorithm into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Review: Approve testing Ok, we may need to file a bug against the metaserver then. This branch is ok for me now :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Setting a correct password and clicking on 'Save' connects immediately to the lobby and immediately disconnect again. One can see this in channel #widelands on IRC. But the assert is gone now :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Popup if wrong password is set works now. But i can still provoke the Assertion: 1. Open the settings 2. Enter a wrong password and close the popup 3. Click cancel 4. Try to connect with the metaserver (click on Online Game) Running widelands with a new home directory does not show this error. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_new_wai_files_21052019 into lp:widelands
I guess you can merge it immediately, because no one can interpret this values :-D -- https://code.launchpad.net/~widelands-dev/widelands/ai_new_wai_files_21052019/+merge/367709 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_new_wai_files_21052019 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
I am on my fast(er) machine now, but here there is no also error. But after the output of NOCOM loading sound effect: sound/hammering//hammering_02.ogg the output stops for a while. On each load of the save game the stop-time is different, one time the stop lasts longer, the other time it lasts shorter (but noticeable). -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
hm, there is now a text conflict shown... Text conflict in data/tribes/workers/frisians/soldier/init.lua -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
with build20 i get the alsa error much earlier, when loading immovables: ┃Immovables: 859ms ALSA lib pcm.c:8424:(snd_pcm_recover) underrun occurred I had to create a new save game though, because the attached one is incompatible. Not sure if all buildings were erected at this time. And i have the feeling the game starts much faster than with this branch. With current trunk i get never the alsa error, so my sound driver seems to work fine with all of the files. Maybe related: https://stackoverflow.com/questions/14601666/alsa-ways-to-prevent-underrun-for-speaker -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
I get this on a slow laptop, so maybe this machine dependent. Just curious that i didn't get this with trunk. Toni, can you compare loading the save game with trunk, so we can see if this is really 10 sec. faster? Comparing the time for the editor would also be nice. Anyway i noticed no other issues with this branch :-) So please can someone make a code review? -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
When watching the console output, the output stops exactly at that line for a while. It shows the error from alsa-lib and and after some time the timestamp "took: ...ms" -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
hm, loading a 8-players save game needs much more time with this branch here. trunk is r9111, both are release builds: stoppped by hand: trunk: ~ 11 sec. this branch: ~ 24 sec. The main difference when comparing the logs, is this output: Trunk: Second and third phase loading Map Objects ... took 34ms This branch: Second and third phase loading Map Objects ... ALSA lib pcm.c:8424:(snd_pcm_recover) underrun occurred took 13645ms So i am not sure if the alsa-thing is the cause of the difference. This alsa underrun happens each time i load that savegame with this branch, but not when loading it in trunk. -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
This is a big feature and should be merged soon! Will do some testing today :-) -- https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818013-new-logo into lp:widelands
>From my side: no. Not tested though. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818013-new-logo/+merge/366502 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1818013-new-logo into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website
Thanks, merged and deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/gaming_password/+merge/367448 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Review: Needs Fixing Hm, there is some inconsistency and an assertion: 1. Start widelands 2. Set a wrong password -> No hint about wrong password -> Login dialog closes 3. Trying to get into the lobby shows now a warning -> Loginbox appear 4. Set a wrong password again -> now the warning appears immediately 5. Close dialog by pressing 'Cancel' (did not test right click to close it) 6. Try to enter the lobby -> Assertion: widelands: /home/kaputtnik/Quellcode/widelands-repo/bug-1827786-metaserver-login-box-clean-start/src/ui_fsmenu/multiplayer.cc:134: void FullscreenMenuMultiPlayer::internet_login(): Assertion `!auth.empty()' failed. If feasible the warning about wrong password should appear also in step 2. I am fine with the wording though :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Ordering the buttons like here https://i.ibb.co/b3W3x3W/internetgame.png is more logical, imho, because the 'Login settings' belongs to 'Internet Game'. And maybe rename 'Login Settings' to 'Internet Settings'? So a user can directly associate that the two buttons belongs to the same thing. All the rest is fine for me :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
Trying to load a savgame from trunk prints now in a window (and console): Game data error buildingdata: building 524547: not found Loading in trunk works fine. Save game: https://bugs.launchpad.net/widelands/+bug/1597310/+attachment/5264357/+files/construction_site_settings.wgf -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/constructionsite_options into lp:widelands
Looks like this branch breaks savegame compatibility. When trying to load a game which runs fine in trunk i get: Writing Buildingdata Data ... widelands: /home/kaputtnik/Quellcode/widelands-repo/constructionsite_options/src/map_io/map_buildingdata_packet.cc:974: void Widelands::MapBuildingdataPacket::write_constructionsite(const Widelands::ConstructionSite&, FileWrite&, Widelands::Game&, Widelands::MapObjectSaver&): Assertion `constructionsite.settings_' failed. Abgebrochen (Speicherabzug geschrieben) -- https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/constructionsite_options into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website
Review: Resubmit Commit 544 give's a user some sort of success messages when he edits his profile or gaming password. After saving both views (edit_profile and edit_ggz) the user is redirected to the main profile view, where the success message is shown centered on the top. I guess my new english sentences are fine, but could you please look again? -- https://code.launchpad.net/~widelands-dev/widelands-website/gaming_password/+merge/367448 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
> We rename the back button to "Leave lobby" > Above the button we have a checkbox "Clear login data" "Leave lobby and clear login data" would be the correct explanation. But it's confusing anyway to have this in the lobby. Maybe i am too nitpicking ;) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website
Many thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/gaming_password/+merge/367448 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
I am not convinced by this solution, it is confusing: 1. We have two places (views) which interact with the same thing now. 2. We have two buttons, 'Logout' and 'Back', in the lobby now, which do the same at first sight: Go back to the 'Multiplayer' view. How will a tooltip, if there were any, look to explain the buttons? Having it like before is better, imho, although the small icon (button) to show the loginbox is visually disturbing. But better a visually disturbing thing than a confusing UI, especially because the Multiplayer view is mostly open for a short time. Just my personal opinion :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website.
Commit message:
Better place for setting the online gaming password
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1828677 in Widelands Website: "Give online gaming password a more
prominent place."
https://bugs.launchpad.net/widelands-website/+bug/1828677
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/gaming_password/+merge/367448
Rework of a users profile page:
Removed tabs, because the links are also in the loginbox:
- Messages
- Scheduler
Added tab:
- Gaming Password
- Renamed Tab 'E-Mail settings' -> 'Notification Settings'
Added an additional edit field for setting the gaming password, so the password
has to be entered two times. Added a check to compare the entered data and give
an errormessage if the passwords didn't match.
Added some help text.
Moved hashing of password to models.py, because i think it fits better over
there.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/gaming_password into lp:widelands-website.
=== modified file 'templates/django_messages/base.html'
--- templates/django_messages/base.html 2019-02-23 19:02:18 +
+++ templates/django_messages/base.html 2019-05-15 06:56:07 +
@@ -1,4 +1,4 @@
-{% extends "wlprofile/base.html" %}
+{% extends "mainpage/base.html" %}
{% load i18n %}
{% load static %}
@@ -9,8 +9,6 @@
{{ block.super}}{% endblock %}
-{% block messages %}class="active"{% endblock %}
-
{% block title %}
Messages - {{block.super}}
{% endblock %}
=== modified file 'wlggz/forms.py'
--- wlggz/forms.py 2019-03-05 08:47:47 +
+++ wlggz/forms.py 2019-05-15 06:56:07 +
@@ -10,13 +10,12 @@
from models import GGZAuth
from django.utils.translation import ugettext_lazy as _
-import hashlib
-import base64
-
class EditGGZForm(forms.ModelForm):
password = forms.CharField(label=_(u'Online Gaming Password'),
widget=forms.PasswordInput(render_value=False), required=True)
+password2 = forms.CharField(label=_(u'Enter again'),
+ widget=forms.PasswordInput(render_value=False), required=True)
class Meta:
model = GGZAuth
@@ -27,11 +26,9 @@
super(EditGGZForm, self).__init__(instance=instance, *args, **kwargs)
-def clean_password(self):
-pw = self.cleaned_data['password']
-pw_hash = hashlib.sha1(pw.encode('utf-8')).digest()
-pw_base64 = base64.standard_b64encode(pw_hash)
-return pw_base64
-
-def save(self, *args, **kwargs):
-super(EditGGZForm, self).save(*args, **kwargs)
+def clean(self):
+cleaned_data = super(EditGGZForm,self).clean()
+pw = cleaned_data.get('password')
+pw2 = cleaned_data.get('password2')
+if pw != pw2:
+self.add_error('password2', "The passwords didn't match")
=== modified file 'wlggz/models.py'
--- wlggz/models.py 2019-03-31 11:08:21 +
+++ wlggz/models.py 2019-05-15 06:56:07 +
@@ -13,6 +13,8 @@
from django.utils.translation import ugettext_lazy as _
from pybb.models import Post
+import hashlib
+import base64
class GGZAuth(models.Model):
user = AutoOneToOneField(
@@ -24,3 +26,11 @@
class Meta:
verbose_name = _('ggz')
verbose_name_plural = _('ggz')
+
+def save(self, *args, **kwargs):
+# hash the password
+pw_hash = hashlib.sha1(self.password.encode('utf-8')).digest()
+pw_base64 = base64.standard_b64encode(pw_hash)
+self.password = pw_base64
+# Save into the database
+super(GGZAuth, self).save(*args, **kwargs)
=== modified file 'wlggz/templates/wlggz/edit_ggz.html'
--- wlggz/templates/wlggz/edit_ggz.html 2019-01-24 18:03:54 +
+++ wlggz/templates/wlggz/edit_ggz.html 2019-05-15 06:56:07 +
@@ -1,4 +1,4 @@
-{% extends "mainpage/base.html" %}
+{% extends "wlprofile/base.html" %}
{% load i18n %}
@@ -6,17 +6,28 @@
{% trans "Set Online Gaming Password" %} - {{ block.super }}
{% endblock %}
+{% block game_passwrd %}class="active"{% endblock %}
+
{% block content_header %}
{% trans "Set Online Gaming Password" %}
{% endblock %}
{% block content_main %}
-
+
+ The password set here can be used when playing widelands over internet.
+ Although it is optional to use a password it is recommended to use one,
+ because your username will be reserved then. The password is stored encrypted.
+ To use the password on internetgames:
+
+ Start the game and click on 'Multiplayer -> Internet Game'
+ Enter your websit
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start into lp:widelands
Looks good, imho. Graying out the 'Password' is sufficient :-) The green arrow on the right of 'Internet Game' is always shown now? -> I tried to start widelands with a new homedir, and the green arrow was shown. Don't forget to remove the 'red border' thing from the commit message please ;) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games-clean-start. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Here is the save game: https://bugs.launchpad.net/widelands/+bug/1828627/+attachment/5262992/+files/wl_autosave_00.wgf -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
I get a crash when trying to open the buildings statistics menu:
Texture (21925, 7772) too big! Maximum size is 2048.
Fatal exception: Texture (21925, 7772) too big! Maximum size is 2048.
FATAL ERROR - game crashed. Attempting emergency save.
The crash does not appear in current trunk, so i guess it is in this branch.
Backtrace:
FATAL ERROR - game crashed. Attempting emergency save.
Game: Writing Preload Data ...
Thread 1 "widelands" received signal SIGSEGV, Segmentation fault.
Widelands::GamePreloadPacket::write (this=0x7fff9700, fs=..., game=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_preload_packet.cc:114
114 s.set_int("gametype",
static_cast(game.game_controller()->get_game_type()));
(gdb) bt
#0 Widelands::GamePreloadPacket::write (this=0x7fff9700, fs=..., game=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_preload_packet.cc:114
#1 0x565af007 in Widelands::GameSaver::save (this=0x7fff9800)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_saver.cc:51
#2 0x56148385 in
SaveHandleroperator()(FileSystem &) const (
__closure=0x7fff9cb0, fs=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/save_handler.cc:250
#3 0x56148757 in std::_Function_handler >::_M_invoke(const std::_Any_data
&, FileSystem &) (
__functor=..., __args#0=...) at
/usr/include/c++/8.3.0/bits/std_function.h:297
#4 0x56474f11 in std::function::operator()(FileSystem&) const (this=0x7fff9cb0,
__args#0=...) at /usr/include/c++/8.3.0/bits/std_function.h:687
#5 0x56472a2d in GenericSaveHandler::save_file (this=0x7fff9cb0)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/generic_save_handler.cc:108
#6 0x56472f14 in GenericSaveHandler::save (this=0x7fff9cb0)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/generic_save_handler.cc:166
#7 0x561484be in SaveHandler::save_game (this=0x7fffa910,
game=...,
complete_filename="save/2019-05-10T22.59.49.wgf", error_str=0x7fff9e90)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/save_handler.cc:253
#8 0x55f7434e in WLApplication::emergency_save (game=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1482
#9 0x55f73774 in WLApplication::load_game (this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1384
#10 0x55f722fe in WLApplication::mainmenu_singleplayer
(this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1207
#11 0x55f71c2b in WLApplication::mainmenu (this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1109
#12 0x55f6dfa7 in WLApplication::run (this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:465
#13 0x55f6c2be in main (argc=1, argv=0x7fffe578)
at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/main.cc:44
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/font_size-lua into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/show_user_posts into lp:widelands-website
Many thanks :-) Will deploy in the next days... -- https://code.launchpad.net/~widelands-dev/widelands-website/show_user_posts/+merge/367237 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands
As talked on IRC: Can you try to remove the red border around the password editbox and instead show the string 'Password' and the corresponding editbox look sort of grayed out? I think the text below can also be improved: "You need an account on the widelands website to use a registered account. Please visit " -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box/+merge/367100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/show_user_posts into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/show_user_posts into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1825707 in Widelands Website: "Move topic to different forum"
https://bugs.launchpad.net/widelands-website/+bug/1825707
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/show_user_posts/+merge/367237
Add link and view to show all posts of a particular user.
The link is made from the posts count in the user profile. The view contains
all posts of the user, sorted by date.
Example image:
https://bugs.launchpad.net/widelands-website/+bug/1825707/+attachment/5262041/+files/all_users_post.jpg
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/show_user_posts into lp:widelands-website.
=== added file 'pybb/templates/pybb/all_user_posts.html'
--- pybb/templates/pybb/all_user_posts.html 1970-01-01 00:00:00 +
+++ pybb/templates/pybb/all_user_posts.html 2019-05-10 06:18:26 +
@@ -0,0 +1,38 @@
+{% extends 'pybb/base.html' %}
+{% load custom_date %}
+{% load pagination_tags %}
+{% block title %}
+Posts by {{ this_user }}- {{ block.super }}
+{% endblock title %}
+
+{% block content_header %}
+Posts by {{ this_user }}
+{% endblock %}
+
+{% block content_main %}
+
+{{ this_user }} had {{posts|length}} post{{posts|length|pluralize}} written.
+{% autopaginate posts 30 %}
+{% paginate %}
+
+
+
+ Date
+ Forum
+ Topic
+ Post{{posts|length|pluralize}}
+
+
+
+{% for post in posts %}
+
+ {{ post.created|custom_date:user }}
+ {{ post.topic.forum }}
+ {{ post.topic }}
+ "{{ post.body_text|truncatechars:80}}"
+
+{% endfor %}
+
+
+
+{% endblock %}
=== modified file 'pybb/urls.py'
--- pybb/urls.py 2019-03-16 20:10:31 +
+++ pybb/urls.py 2019-05-10 06:18:26 +
@@ -41,6 +41,7 @@
url('^post/(?P\d+)/delete/$',
views.delete_post, name='pybb_delete_post'),
url(r'^latest_posts/$', views.all_latest, name='all_latest_posts'),
+url(r'^user_posts/(?P\w+)/$', views.user_posts, name='all_user_posts'),
# Attachment
url('^attachment/(?P\w+)/$',
=== modified file 'pybb/views.py'
--- pybb/views.py 2019-03-23 09:00:44 +
+++ pybb/views.py 2019-05-10 06:18:26 +
@@ -474,5 +474,20 @@
'sort_by': sort_by
}
-
all_latest = render_to('pybb/all_last_posts.html')(all_latest_posts)
+
+@login_required
+def all_user_posts(request, this_user=None):
+"""Get all posts of a user"""
+
+if this_user:
+posts = Post.objects.public().filter(user__username=this_user)
+else:
+posts = Post.objects.public().filter(user__username=request.user)
+
+return {
+'this_user': this_user,
+'posts': posts,
+}
+
+user_posts = render_to('pybb/all_user_posts.html')(all_user_posts)
=== modified file 'wlprofile/models.py'
--- wlprofile/models.py 2019-03-31 11:08:21 +
+++ wlprofile/models.py 2019-05-10 06:18:26 +
@@ -62,7 +62,7 @@
to not be always calculated.
"""
-return Post.objects.filter(user=self.user).count()
+return Post.objects.public().filter(user=self.user).count()
def user_status(self):
nump = self.post_count()
=== modified file 'wlprofile/templates/wlprofile/view_profile.html'
--- wlprofile/templates/wlprofile/view_profile.html 2018-10-09 19:52:50 +
+++ wlprofile/templates/wlprofile/view_profile.html 2019-05-10 06:18:26 +
@@ -45,7 +45,7 @@
Forum Posts:
-{{ profile.post_count }}
+{{ profile.post_count }}
Website:
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827033-shipping-algorithm into lp:widelands
I am in favor to revert the changes that caused this failure... although the 'old' shipping algorithm isn't perfect. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827033-shipping-algorithm/+merge/366959 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1827033-shipping-algorithm into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands
It would be good to have the registered checkbox above the password field. It would be a more logical ordering, imho. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box/+merge/367100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825932-open-games. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
Review: Approve testing Really nice, thanks :-) It's good that changing a value will show no text in the editbox, so one can immediately see that there is no profile saved for the chosen value(s). After playing around with the tabs and switching between wares/workers, i found that loading a profile will only apply to the items in the actual tab (wares/workers). Is this correct? We may need an entry in the help for this window. But this can be done in a separate branch. -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/css_border into lp:widelands-website
Thanks. Merged and deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/css_border/+merge/366075 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/css_border into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/css_border
into lp:widelands-website.
Commit message:
Use a css-border for the landing image
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/css_border/+merge/366075
Not sure if we should use the 'round' property instead of 'repeat'. ->
https://caniuse.com/#search=border-image
Some browsers don't support this feature.
Example image: https://i.ibb.co/S3k6WCc/landing-image-border.jpg
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/css_border into lp:widelands-website.
=== modified file 'mainpage/static/css/base.css'
--- mainpage/static/css/base.css 2018-11-21 06:21:45 +
+++ mainpage/static/css/base.css 2019-04-15 21:29:55 +
@@ -409,6 +409,10 @@
img.landing {
margin-left: 20px;
margin-bottom: 15px;
+ border: 10px solid transparent;
+ border-image: url(../img/image_border.png) 20 round;
+ -webkit-border-image: url(../img/image_border.png) 20 round; /* Safari 3.1-5 */
+ -o-border-image: url(../img/image_border.png) 20 round; /* Opera 11-12.1 */
}
div.blogEntry {
@@ -544,4 +548,4 @@
justify-content: center;
margin-bottom: 10px !important;
}
-}
\ No newline at end of file
+}
=== added file 'mainpage/static/img/image_border.png'
Binary files mainpage/static/img/image_border.png 1970-01-01 00:00:00 + and mainpage/static/img/image_border.png 2019-04-15 21:29:55 + differ
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands
Review: Approve testing This is really a nice feature. Played two games (Map Twinkling Waves and The Nile) a lot but found no strange issues anymore. There is one small thing: If you have the option 'Start building road after placing a flag' turned on, and place a flag at a coast, roadbuilding mode is immediately enabled. So if you wanted to start building a waterway, you have to make few more clicks to get into 'build waterway' mode (cancel roadbuilding -> click on flag -> click on build waterway). No idea how to solve this in an easy manner. Just show the flag action window is a flag is placed where also a waterway can be build, regardless of the option 'Start building road after placing a flag'? -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/screshot_ordering into lp:widelands-website
Did also applied some default orderings and reworked also the admmin page for 'Screenshots'. Merged and deployed, happy reordering :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/screshot_ordering/+merge/365763 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/screshot_ordering into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/screshot_ordering into lp:widelands-website.
Commit message:
Allow ordering of screenshots by applying a new database column.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1823634 in Widelands Website: "Allow reordering of screenshots"
https://bugs.launchpad.net/widelands-website/+bug/1823634
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/screshot_ordering/+merge/365763
Add a new database column 'position' to the model of wlscreens_screenshot. This
makes it possible to reorder the screenshots after uploading.
In the admin page a list of screenshots is added to a category. E.g. clicking
on Category 'Build 20' all screenshots for 'Build 20' will be listet. One can
edit (upload, change) the screenshots in this list. So one don't have to edit
each screenshot by its own.
Removed: url for displaying screenshots by one category, which leads only into
a 404.
Changed: Replaced the view function with a django class based view.
I thought also to have the screenshot list paginated, to speed up loading time,
but i didn't found a good solution to display the pagination bar. This can be
done later on.
To get this in:
merge the branch
run: ./manage.py migrate
restart the website
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/screshot_ordering into lp:widelands-website.
=== modified file 'wlscreens/admin.py'
--- wlscreens/admin.py 2016-12-13 18:28:51 +
+++ wlscreens/admin.py 2019-04-09 18:52:10 +
@@ -4,11 +4,14 @@
from models import Category, Screenshot
from django.contrib import admin
-
+class ScreenshotsInline(admin.TabularInline):
+model = Screenshot
+
class CategoryAdmin(admin.ModelAdmin):
prepopulated_fields = {'slug': ('name',)}
search_fields = ['name']
list_display = ['name']
+inlines = [ScreenshotsInline,]
admin.site.register(Category, CategoryAdmin)
=== added file 'wlscreens/migrations/0002_auto_20190409_0924.py'
--- wlscreens/migrations/0002_auto_20190409_0924.py 1970-01-01 00:00:00 +
+++ wlscreens/migrations/0002_auto_20190409_0924.py 2019-04-09 18:52:10 +
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-09 09:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+dependencies = [
+('wlscreens', '0001_initial'),
+]
+
+operations = [
+migrations.AlterModelOptions(
+name='screenshot',
+options={'ordering': ['position']},
+),
+migrations.AddField(
+model_name='screenshot',
+name='position',
+field=models.IntegerField(blank=True, default=0, help_text=b'The position inside the category', null=True),
+),
+]
=== modified file 'wlscreens/models.py'
--- wlscreens/models.py 2019-03-31 11:08:21 +
+++ wlscreens/models.py 2019-04-09 18:52:10 +
@@ -35,9 +35,6 @@
return super(Category, self).save(*args, **kwargs)
-def get_absolute_url(self):
-return reverse('wlscreens_category', kwargs={'category_slug': self.slug})
-
def __unicode__(self):
return u"%s" % self.name
@@ -65,35 +62,54 @@
editable=False,
storage=OverwriteStorage(),
)
-comment = models.TextField(null=True, blank=True)
-category = models.ForeignKey(Category, related_name='screenshots')
+comment = models.TextField(
+null=True,
+blank=True
+)
+category = models.ForeignKey(
+Category,
+related_name='screenshots'
+)
+position = models.IntegerField(
+null=True,
+blank=True,
+default=0,
+help_text='The position inside the category',
+)
class Meta:
unique_together = ('name', 'category')
+ordering = ['position',]
def save(self, *args, **kwargs):
# Open original screenshot which we want to thumbnail using PIL's Image
# object
-image = Image.open(self.screenshot)
-
-# Convert to RGB if necessary
-if image.mode not in ('L', 'RGB'):
-image = image.convert('RGB')
-
-image.thumbnail(settings.THUMBNAIL_SIZE, Image.ANTIALIAS)
-
-# Save the thumbnail
-temp_handle = StringIO()
-image.save(temp_handle, 'png')
-temp_handle.seek(0)
-
-# Save to the thumbnail field
-suf = SimpleUploadedFile(os.path.split(self.screenshot.name)[-1],
-
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
This is merged and deployed. Now we can definitely work on porting to python3 :) I had to change the init-file to let gunicorn find the moved file wlwebsite_wsgi.py -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
Thanks, all fixed, also the smiley thing(s). I'll do the merge eventually this evening. -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
Looks like it works fine on alpha. -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. Commit message: Moved main files into folder mainpage Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1762164 in Widelands Website: "Update website code to use python 3.x" https://bugs.launchpad.net/widelands-website/+bug/1762164 For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Python3 is more restrictive with relative imports. Moving the mainfiles into the directory 'mainpage' is made to perform this. In python terms: The folder widelands (containing manage.py) will no longer be a 'package'. Running manage.py will call anything inside the package 'mainpage' and thus relative imports will work again. This reflects also the initial structure of a django project, like shown here: https://docs.djangoproject.com/en/2.2/intro/reusable-apps/#your-project-and-your-reusable-app Running the 2to3 script (for porting python2 to python3 code) produces less faulty code in regard to imports after this change. I have also moved the privacy template to his origin (privacy_policy). Should be tested on alpha. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website. === modified file 'README.txt' --- README.txt 2018-12-30 11:45:03 + +++ README.txt 2019-04-07 09:29:16 + @@ -57,6 +57,7 @@ This will take a while. If no errors are shown we should be fine. + Setting up the website == @@ -68,8 +69,8 @@ those files and modify them to your needs - most likely everything works directly, but you might want to edit the bd variable in local_settings.py:: - $ ln -s local_urls.py.sample local_urls.py - $ ln -s local_settings.py.sample local_settings.py + $ ln -s local_urls.py.sample mainpage/local_urls.py + $ ln -s local_settings.py.sample mainpage/local_settings.py Setting up the database --- @@ -125,60 +126,63 @@ See also https://docs.djangoproject.com/en/dev/ref/django-admin/#examples-of-using-different-ports-and-addresses for further details. + Dependencies between website and widelands source code == -Some parts of the website need access to the source code of widelands: - -* Online help/Encyclopedia -* Possibility to upload a map onto the local website -* Source code documentation - -You will need the widelands source code for this, see +Some parts of the website need access to the source code of widelands, other +parts need some widelands executables. + +Source code only + + +The documentation is made out of the source code. To get a copy, see: https://wl.widelands.org/wiki/BzrPrimer/ After the source code is downloaded, adjust the path of -WIDELANDS_SVN_DIR - -in local_settings.py to the path where the widelands source code is found. - -Setting up the online help / encyclopedia -- - -You will need graphviz to generate the graphs for the online help. On Ubuntu run: +WIDELANDS_SVN_DIR = '/path/to/widelands/trunk' + +in mainpage/local_settings.py to the path where the widelands source code can be +found. Then run: + + $ ./manage.py create_docs + +After finishing without errors, type localhost:8000/documentation/index.html +in your browsers addressbar or click on "Development -> Documentation". + +Widelands executables +- + +Widelands executables are needed to: + +* Upload maps to the website +* Create the Encylopdia + +Either install widelands as a program to your operating system, or create the +binarys by compiling the source code. If you want to compile, run: + + $ ./compile.sh -r + +inside of the WIDELANDS_SVN_DIR to create a release build. + +Uploading maps should work now. + +Creating the encyclopdia needs graphviz to generate the graphs. On Ubuntu run: $ sudo apt-get install graphviz -To generate the online help database switch to your local environment and run: +To generate the online help switch to your local environment and run: $ ./manage.py update_help -After that you can create the overview pdf files with +Now you can create the economy graphs: $ ./manage.py update_help_pdf -Setting up widelands source code documentation --- - -There is a small helper script to get the documenation. Be sure -you have set WIDELANDS_SVN_DIR set in local_settings.py. Run: - - $ ./manage.py create_docs - -After finishing without errors, type localhost:8000/documentation/index.html -in your browsers addressbar or click on "Development -> Documentation". - - -Uploading a map to the local website - - -Compile the widel
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bridges into lp:widelands
Maybe i should test the ferrys in the appropriate branch... can't get them to work... Regarding the bridges i think having a bridge for normal roads which looks more like a wooden footbridge would be nicer. Lifting the workers when walking over the bridge is really nice :) -- https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bridges into lp:widelands
Forget: To reproduce 1. load 'test_ferries.wgf' 2. Build a waterway from flag 30,28 to node 31,27 3. Save the game 4. Try to load the previous saved game -- https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bridges into lp:widelands
Review: Needs Fixing I get an error when trying to load this savegame: https://bugs.launchpad.net/widelands/+bug/734193/+attachment/5252593/+files/test_ferries_1.wgf This savegame was made close before the other one. The difference is this savegame has no waterway yet. The other savegame has a waterway, which has no ferry: https://bugs.launchpad.net/widelands/+bug/734193/+attachment/5252594/+files/test_ferries.wgf -- https://code.launchpad.net/~widelands-dev/widelands/bridges/+merge/364318 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ferry. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/new_frisian_roads into lp:widelands
kaputtnik has proposed merging lp:~widelands-dev/widelands/new_frisian_roads into lp:widelands. Commit message: New road images for the Frisians tribe Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/new_frisian_roads/+merge/365496 See commit message. Approved in the forum: https://wl.widelands.org/forum/topic/4485/ This is for release 21 :-) -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/new_frisian_roads into lp:widelands. === modified file 'data/tribes/images/frisians/roadt_busy.png' Binary files data/tribes/images/frisians/roadt_busy.png 2019-03-30 06:46:25 + and data/tribes/images/frisians/roadt_busy.png 2019-04-03 18:48:25 + differ === modified file 'data/tribes/images/frisians/roadt_normal_00.png' Binary files data/tribes/images/frisians/roadt_normal_00.png 2019-03-30 06:46:25 + and data/tribes/images/frisians/roadt_normal_00.png 2019-04-03 18:48:25 + differ === modified file 'data/tribes/images/frisians/roadt_normal_01.png' Binary files data/tribes/images/frisians/roadt_normal_01.png 2019-03-30 06:46:25 + and data/tribes/images/frisians/roadt_normal_01.png 2019-04-03 18:48:25 + differ ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website
Sometimes i find the correct english spelling ;) Merged and deployed -- https://code.launchpad.net/~widelands-dev/widelands-website/loginbox_rework/+merge/365005 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website.
Commit message:
Loginbox rework
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1804993 in Widelands Website: "Click target for accessing PMs is too
small"
https://bugs.launchpad.net/widelands-website/+bug/1804993
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/loginbox_rework/+merge/365005
Change the links in the loginbox after a user has logged in to:
Profile | Messages
Playtime Scheduler
Logout
'Profile'and 'Messages' are links to the corresponding pages. The 'Messages'
string get enhanced with '(# Number of unread messages)' if there are any.
'Playtime Scheduler' now links to the start page:
https://wl.widelands.org/scheduling/main/
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website.
=== modified file 'mainpage/templates/mainpage/header.html'
--- mainpage/templates/mainpage/header.html 2019-03-18 19:06:29 +
+++ mainpage/templates/mainpage/header.html 2019-03-24 16:57:05 +
@@ -30,18 +30,20 @@
-
{% if user.is_authenticated %}
+
+ Profile |
{% if messages_inbox_count %}
-Your Profile ({{ messages_inbox_count }})
- {% else %}
-Your Profile
+Messages ({{ messages_inbox_count }})
+ {% else %}
+Messages
{% endif %}
- Playtimes
+ Playtime Scheduler
Logout
{% else %}
+
Login/Register
{% endif %}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
