Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/casern_campaign into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/casern_campaign/+merge/314208 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/casern_campaign. ___ 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/feature-test-supply-crash into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/feature-test-supply-crash/+merge/312422 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/feature-test-supply-crash. ___ 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/production_statistics into lp:widelands
This is a great change, thanks for taking it on and staying with it :) -- https://code.launchpad.net/~widelands-dev/widelands/production_statistics/+merge/314283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/production_statistics. ___ 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/critter_editor_categories into lp:widelands
@toptopple: As I said, the code is in a superclass. Deactivating it for the animals only is more complicated than implementing the ? button, and would lead to really bad code that we would need to remember to rip out again later. I really am in favour of implementing your suggestion, just not in this branch - If I do this now, I will have to wait for another code review before we can get this in at all. -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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/casern_campaign into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/casern_campaign into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/casern_campaign/+merge/314208 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/casern_campaign. ___ 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/critter_editor_categories into lp:widelands
Terrain menus now have a uniform width of 6. Now that I could look at it again, I know why I gave them different width: The second row was all mountains for all tabs. This is now no longer true. Somebody please give it a spin to make sure that this change is indeed better. -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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/feature-test-supply-crash into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/feature-test-supply-crash into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/feature-test-supply-crash/+merge/312422 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/feature-test-supply-crash. ___ 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/critter_editor_categories into lp:widelands
Having the same width of all terrain related tabs is better than switching the window size :-) The width of 6 is not like before, so a bit uncommon, but no showstopper. For my other question i will create another Bug report then, so this can go in. > Is it possible to have images aligned at the bottom of each row? > Currently they are aligned at the top. This most confusing in the > plants tab for the last cactus. But i think for trees it would > also be good to align them on the bottom (if possible). -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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/critter_editor_categories into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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/unique_ptr_coroutine into lp:widelands
Ready to go then :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/unique_ptr_coroutine/+merge/313880 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/unique_ptr_coroutine. ___ 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_save_load_debug into lp:widelands
Review: Approve Still need to compile & test, code LGTM -- https://code.launchpad.net/~widelands-dev/widelands/economy_save_load_debug/+merge/314453 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy_save_load_debug. ___ 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/bug-1399461_error_on_renaming_article into lp:widelands-website
Linguistic proofreading done.
Diff comments:
>
> === added file 'templates/wiki/backlinks.html'
> --- templates/wiki/backlinks.html 1970-01-01 00:00:00 +
> +++ templates/wiki/backlinks.html 2017-01-15 12:03:32 +
> @@ -0,0 +1,38 @@
> +{% extends 'wiki/base.html' %}
> +{% load wiki_extras %}
> +{% load i18n %}
> +{% block title %}
> +{{ name }} - Backlinks - {{block.super}}
> +{% endblock %}
> +
> +{% block content %}
> +
> + Back to
> article
> +
> +{% trans "Backlinks of " %} {{ name }}
> +
> + {% if found_links or found_old_links %}
> + {% if found_links %}
> + Following pages have link(s) which points to this
> article:
The following pages have link(s) which point to this article:
> +
> + {% for article in found_links %}
> + {{ article.title }}
> + {% endfor %}
> +
> + {% endif %}
> + {% if found_old_links %}
> + Following articles have links which points to one of the
> old name(s) of this article (redirects):
The following articles have links which point to one of the old name(s) of
this article (redirects):
> +
> + {% for article in found_old_links %}
> + {{
> article.title }}
> + (has at least one link to: "{{ article.old_title
> }}")
> + {% endfor %}
> +
> + {% endif %}
> + {% else %}
> + Every Wikipage must at least be
> linked from within another page.
Every Wikipage must be linked from at least one other page.
> + Please link it alt="face-smile.png"> See Wiki Syntax
> for explanations.
explanations -> help?
> + {% endif %}
> +
> +{% endblock %}
> +
>
> === modified file 'wiki/forms.py'
> --- wiki/forms.py 2016-12-13 18:28:51 +
> +++ wiki/forms.py 2017-01-15 12:03:32 +
> @@ -34,11 +34,31 @@
> 'group', 'created_at', 'last_update')
>
> def clean_title(self):
> -"""Page title must be a WikiWord."""
> +"""Check for some errors regarding the title:
> +
> +1. Check for bad characters
> +2. Check for already used titles
> +
> +Immediately trying to change the title of a new article to an
> existing title
> +is handled on Database level.
... on the database level.
> +
> +"""
> +
> title = self.cleaned_data['title']
> if not wikiword_pattern.match(title):
> -raise forms.ValidationError(_('Must be a WikiWord.'))
> -
> +raise forms.ValidationError(
> +_('The title can only consist of alphanumeric characters the
> underscore and a blank space'))
Only alphanumeric characters, blank spaces and the underscore are allowed in a
title.
> +
> +# 'self.initial' contains the prefilled values of the form
> +pre_title = self.initial.get('title', None)
> +if pre_title != title or not pre_title:
> +# Check if the new name once has been used
# Check if the new name has been used already
> +cs = ChangeSet.objects.filter(old_title=title)
> +if cs:
> +raise forms.ValidationError(
> +_('The title %(title)s is already in use, maybe an other
> article had once this name.'), params={'title': title},)
The title %(title)s is already in use, maybe another article used to have this
name.
> +
> +# title not changed, no errors
> return title
>
> def clean(self):
>
> === modified file 'wiki/views.py'
> --- wiki/views.py 2016-12-13 18:28:51 +
> +++ wiki/views.py 2017-01-15 12:03:32 +
> @@ -478,18 +475,23 @@
>
> article = get_object_or_404(article_qs, **article_args)
>
> -if request.user.is_authenticated():
> -article.revert_to(revision, get_real_ip(request), request.user)
> -else:
> -article.revert_to(revision, get_real_ip(request))
> -
> -# NOCOMM Franku: This has never worked as i know and is IMHO
> -# useless. If we want this it has to be fixed for django 1.8
> -# See comment in edit_article()
> -# if request.user.is_authenticated():
> -# request.user.message_set.create(
> -# message=u"The article was reverted successfully.")
> -
> +
> +# Check whether there is another Article with the same name to which
> this article
> +# want's to be reverted to. If so: prevent it and show a message.
wants
's is used for genitive only ;)
> +old_title = article.changeset_set.filter(
> +revision=revision+1).get().old_title
> +try:
> +art = Article.objects.exclude(pk=article.pk).get(title=old_title)
> +except Article.DoesNotExist:
> +# No existing article found -> reverting possible
> +if request.user.is_authenticated():
> +
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/critter_editor_categories into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/critter_editor_categories into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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/production_statistics into lp:widelands
I implemented the changes, f.e. I changed definition of functions to RequestedWareWorker parse_wares_workers_list(lua_State*, const Widelands::TribeDescr&, Widelands::DescriptionIndex*, std::vector*, bool is_ware); RequestedWareWorker parse_wares_workers_counted(lua_State*, const Widelands::TribeDescr&, WareWorkersMap*, bool is_ware); But I borked the lua_map.* files, somehow entire files are being "updated" :( :( :( -- https://code.launchpad.net/~widelands-dev/widelands/production_statistics/+merge/314283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/production_statistics. ___ 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/production_statistics into lp:widelands
OK, it was problem with EOL - I modified the two files on windows. Now the diff is more reasonable. -- https://code.launchpad.net/~widelands-dev/widelands/production_statistics/+merge/314283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/production_statistics. ___ 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/bug-1399461_error_on_renaming_article into lp:widelands-website
Thanks a lot :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/bug-1399461_error_on_renaming_article/+merge/314033 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/production_statistics into lp:widelands
Continuous integration builds have changed state: Travis build 1827. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/192828510. Appveyor build 1665. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_production_statistics-1665. -- https://code.launchpad.net/~widelands-dev/widelands/production_statistics/+merge/314283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/production_statistics. ___ 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
