Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands
Review: Approve The TODOs get tagged with the person who created them, so we can get back to them later in case we don't understand the TODO. It doesn't mean that you have to fix it personally ;) Test suite is green now, and I have also done a saveloading test with a savegame from trunk. Running 8 AIs on The Nile on auto_speed slowed down to a crawl before 4 hours gametime, but we are having a problem in trunk (https://bugs.launchpad.net/widelands/+bug/1795976), so it might not be related to this branch. This will make a great feature for Build 21, thank you! :) -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/355510 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ 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_1794339_center_wo_parent into lp:widelands
Continuous integration builds have changed state: Travis build 4095. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/437873611. Appveyor build 3891. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1794339_center_wo_parent-3891. -- https://code.launchpad.net/~widelands-dev/widelands/bug_1794339_center_wo_parent/+merge/355885 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1794339_center_wo_parent 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_1794339_center_wo_parent into lp:widelands
Ok made this an assert -- https://code.launchpad.net/~widelands-dev/widelands/bug_1794339_center_wo_parent/+merge/355885 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1794339_center_wo_parent 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/cleanup_threadedcomments into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/cleanup_threadedcomments into
lp:widelands-website.
Commit message:
Removed model FreeThreadedComments and its dependencies
Remove IP-Adress field from Threadedcomments
Scroll directly to the comments when clicking on 'x comments' in the mainpage
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1780536 in Widelands Website: "Add a GDPR (german: DSGVO) to the website"
https://bugs.launchpad.net/widelands-website/+bug/1780536
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_threadedcomments/+merge/356200
This is a big cleanup for threadedcomments, with regard to bug 1762164
Since we do not allow commenting for not logged in users, i have removed the
related model and all it's dependencies. The model does not contain any data,
see https://wl.widelands.org/admin/threadedcomments/freethreadedcomment/
Removed the IPAddressField from the other model.
Removed django_comments, because it is not needed.
Clicking on 'x Comments' in the mainpage will directly scroll to the comments
section in the related page.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/cleanup_threadedcomments into
lp:widelands-website.
=== modified file 'pip_requirements.txt'
--- pip_requirements.txt 2018-04-14 15:03:31 +
+++ pip_requirements.txt 2018-10-05 16:29:25 +
@@ -2,7 +2,6 @@
BeautifulSoup==3.2.0
Django==1.11.12
-django-contrib-comments==1.8.0
django-haystack==2.8.1
# django-messages is very old on pypi
# Do not install newer versions because our notifications app is affected
=== modified file 'templates/news/inlines/post_detail.html'
--- templates/news/inlines/post_detail.html 2017-05-20 20:17:28 +
+++ templates/news/inlines/post_detail.html 2018-10-05 16:29:25 +
@@ -26,6 +26,6 @@
{% get_comment_count for object as ccount %}
- {{ ccount }} comment{{ ccount|pluralize }}
+ {{ ccount }} comment{{ ccount|pluralize }}
Posted by {{object.author|user_link}} on {{ object.publish|custom_date:user }}
=== modified file 'templates/news/post_detail.html'
--- templates/news/post_detail.html 2016-11-20 11:55:39 +
+++ templates/news/post_detail.html 2018-10-05 16:29:25 +
@@ -30,7 +30,7 @@
{% include "news/inlines/post_detail.html" %}
- Comments on this Post:
+ Comments on this Post:
{% include "threadedcomments/inlines/comments.html" %}
{% endblock %}
=== modified file 'threadedcomments/admin.py'
--- threadedcomments/admin.py 2016-12-13 18:28:51 +
+++ threadedcomments/admin.py 2018-10-05 16:29:25 +
@@ -1,6 +1,6 @@
from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
-from threadedcomments.models import ThreadedComment, FreeThreadedComment
+from threadedcomments.models import ThreadedComment
class ThreadedCommentAdmin(admin.ModelAdmin):
@@ -9,7 +9,7 @@
(_('Parent'), {'fields': ('parent',)}),
(_('Content'), {'fields': ('user', 'comment')}),
(_('Meta'), {'fields': ('is_public', 'date_submitted',
-'date_modified', 'date_approved', 'is_approved', 'ip_address')}),
+'date_modified', 'date_approved', 'is_approved')}),
)
list_display = ('user', 'date_submitted', 'content_type',
'get_content_object', 'parent', '__unicode__')
@@ -18,20 +18,4 @@
search_fields = ('comment', 'user__username')
-class FreeThreadedCommentAdmin(admin.ModelAdmin):
-fieldsets = (
-(None, {'fields': ('content_type', 'object_id')}),
-(_('Parent'), {'fields': ('parent',)}),
-(_('Content'), {'fields': ('name', 'website', 'email', 'comment')}),
-(_('Meta'), {'fields': ('date_submitted', 'date_modified',
-'date_approved', 'is_public', 'ip_address', 'is_approved')}),
-)
-list_display = ('name', 'date_submitted', 'content_type',
-'get_content_object', 'parent', '__unicode__')
-list_filter = ('date_submitted',)
-date_hierarchy = 'date_submitted'
-search_fields = ('comment', 'name', 'email', 'website')
-
-
admin.site.register(ThreadedComment, ThreadedCommentAdmin)
-admin.site.register(FreeThreadedComment, FreeThreadedCommentAdmin)
=== modified file 'threadedcomments/forms.py'
--- threadedcomments/forms.py 2016-12-13 18:28:51 +
+++ threadedcomments/forms.py 2018-10-05 16:29:25 +
@@ -1,6 +1,6 @@
from django import forms
from threadedcomments.models import DEFAULT_MAX_COMMENT_LENGTH
-from threadedcomments.models import FreeThreadedComment, ThreadedComment
+from threadedcomments.models import ThreadedComment
from django.utils.translation import ugettext_lazy as _
@@ -21,23 +21,3 @@
class Meta:
model = ThreadedComment
fields = ('comment', 'markup')
-
-
-class FreeThreadedCommentForm(forms.ModelForm
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands
Continuous integration builds have changed state: Travis build 4094. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/437518591. Appveyor build 3890. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ship_scheduling_2-3890. -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/355510 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ 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/ship_scheduling_2 into lp:widelands
Concerning the specific TODO, the code for invalid destinations pre-existed my involvement and is suspicious enough. I just moved it earlier in the function, in order to catch more cases. I don't know which are those cases (they don't happen in any part of the code that I touched), only that some of them appear when loading a savegame. I'm not familiar with that part of the codebase, so maybe this TODO is not for me. -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/355510 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ 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/frisian_balancing_worldsavior_201809 into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4092. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/437007517. -- https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_worldsavior_201809/+merge/355907 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian_balancing_worldsavior_201809. ___ 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/cmakepolicy into lp:widelands
Trunk also has problems in Ubuntu Trusty builds: CMake Error at CMakeLists.txt:4 (cmake_policy): Policy "CMP0054" is not known to this version of CMake. https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15512527 So, making this fix work is very much desired :) -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ 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] [Build #15512526] amd64 build of widelands 1:19-ppa0-bzr8868-201810050716~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8868-201810050716~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 2 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15512526/+files/buildlog_ubuntu-trusty-amd64.widelands_1%3A19-ppa0-bzr8868-201810050716~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-043 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8868-201810050716~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15512526 You are receiving this email because you created this version of this package. ___ 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] [Build #15512527] i386 build of widelands 1:19-ppa0-bzr8868-201810050716~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8868-201810050716~ubuntu14.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 3 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15512527/+files/buildlog_ubuntu-trusty-i386.widelands_1%3A19-ppa0-bzr8868-201810050716~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-041 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr8868-201810050716~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15512527 You are receiving this email because you created this version of this package. ___ 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/frisian_balancing_worldsavior_201809 into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_worldsavior_201809/+merge/355907 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian_balancing_worldsavior_201809. ___ 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
