Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/cleanup_threadedcomments into lp:widelands-website

2018-10-10 Thread kaputtnik
Will merge this at the next weekend -- https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_threadedcomments/+merge/356200 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.ne

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/privacy_policy into lp:widelands-website

2018-10-10 Thread kaputtnik
Merged and deployed. Gave GunChleoc rights to add/change/delete privacy policies. Added a German privacy policy. -- https://code.launchpad.net/~widelands-dev/widelands-website/privacy_policy/+merge/356282 Your team Widelands Developers is subscribed to branch lp:widelands-website. _

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/privacy_policy into lp:widelands-website

2018-10-10 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/privacy_policy into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/privacy_policy/+merge/356282 -- Your team Widelands Develope

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands

2018-10-10 Thread bunnybot
Continuous integration builds have changed state: Travis build 4109. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/439709708. Appveyor build 3904. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fri_portra

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands

2018-10-10 Thread hessenfarmer
Review: Approve At least the style is consistent now. I think the difference to the frisians is good for the player to distinguish between them easily. Thanks a lot -- https://code.launchpad.net/~widelands-dev/widelands/fri-portraits/+merge/356221 Your team Widelands Developers is subscribed to

[Widelands-dev] [Build #15527099] amd64 build of widelands 1:19-ppa0-bzr8875-201810101704~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]

2018-10-10 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:19-ppa0-bzr8875-201810101704~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 3 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/wi

[Widelands-dev] [Build #15527100] i386 build of widelands 1:19-ppa0-bzr8875-201810101704~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]

2018-10-10 Thread Launchpad Buildd System
* Source Package: widelands * Version: 1:19-ppa0-bzr8875-201810101704~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/wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/privacy_policy into lp:widelands-website

2018-10-10 Thread kaputtnik
Good catch! ^ means the string has to be at the beginning. Without it is also possible to call the url '/fooprivacy/' which is not what is wanted. Thanks a lot for the review :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/privacy_policy/+merge/356282 Your team Widelands Deve

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands

2018-10-10 Thread ypopezios
You keep calling that a feature, while it is mostly a fix for the long-standing poor scheduling, so technically it still applies despite the feature freeze. Furthermore, the freeze was announced on 2018-09-17, while this branch has been approved on 2018-09-14. The late problems with the test sui

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/privacy_policy into lp:widelands-website

2018-10-10 Thread GunChleoc
Review: Approve LGTM - just 1 comment for a potential bug Diff comments: > > === modified file 'urls.py' > --- urls.py 2018-09-12 07:45:35 + > +++ urls.py 2018-10-09 18:02:37 + > @@ -58,6 +58,7 @@ > url(r'^ggz/', include('wlggz.urls')), > url(r'^moderated/', include('check

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/cleanup_threadedcomments into lp:widelands-website

2018-10-10 Thread GunChleoc
Review: Approve LGTM, just 1 tiny nit - we have an extra indent that we could lose Diff comments: > > === modified file 'threadedcomments/views.py' > --- threadedcomments/views.py 2018-04-05 07:30:42 + > +++ threadedcomments/views.py 2018-10-05 16:44:16 + > @@ -87,25 +89,19 @@ > if

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands

2018-10-10 Thread GunChleoc
No, I did mean Build 21. We are in feature freeze, and feature freeze means it's feature freeze for everybody. Otherwise, we'll never get a release out, because there will always be that one cool feature we'll want to squeeze in. It's very tempting. Having an assignee in TODO comment would only

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands

2018-10-10 Thread Benedikt Straub
Portrait for Murilius is uploaded. He looks a bit different to the Frisian people though ;) -- https://code.launchpad.net/~widelands-dev/widelands/fri-portraits/+merge/356221 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-portraits. __

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-10-10 Thread bunnybot
Continuous integration builds have changed state: Travis build 4107. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/439517974. Appveyor build 3902. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fix

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands

2018-10-10 Thread Benedikt Straub
Yes, the empire workers are also in the repo. It´ll still look somewhat different though due to different modelling style. I´ll make the image this evening :) -- https://code.launchpad.net/~widelands-dev/widelands/fri-portraits/+merge/356221 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands

2018-10-10 Thread hessenfarmer
the portraits are better now with the canvas texture they don't look that bad anymore. Do you have the blender files for the romans as well to create a Screenshot also for Murilius? That would give us some consistency over the Frisian campaign -- https://code.launchpad.net/~widelands-dev/widelan

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-portraits into lp:widelands

2018-10-10 Thread Benedikt Straub
I have given the portraits (including Murilius) some editing in GIMP now to give them a painting-like look and a playercolored frame. How about these? -- https://code.launchpad.net/~widelands-dev/widelands/fri-portraits/+merge/356221 Your team Widelands Developers is subscribed to branch lp:~wid

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-10-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Improved error messages for gl initialize. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-10-10 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Description changed to: The error message for the shading language version is a bit misleading, so I did some rework. Also, the dialog box was too wide for my taste. For more details, see: https: