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

2016-06-28 Thread SirVer
A massive change! Congratulations for bringing this over the finish line. I think this is pretty much unreviewable with 17k lines, I suggest merging as is and see if problems on the homepage arise. Alternatively you could point out specific files/parts of the code that you'd like feedback on.

Re: [Widelands-dev] Feature Freeze?

2016-06-28 Thread Holger Rapp
I am all for it. This would be first snow feature freeze. https://wl.widelands.org/wiki/ReleasingWidelands/ There are also still a few open bugs, but they can be fixed after feature freeze, but must be fixed before the release candidate. http

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread bunnybot
Continuous integration builds have changed state: Travis build 1169. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/140925592. Appveyor build 1007. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_157008

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread kaputtnik
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread kaputtnik
Don't test yet, i have forgotton to change the init.lua... :-S Update is in progress -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-15

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread GunChleoc
Thanks for renaming :) To me, "flows" looks like somebody can'r spell ;) https://dict.leo.org/ende/index_de.html#/search=Eisscholle https://dict.leo.org/ende/index_de.html#/search=floe -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread kaputtnik
:-D done renaming ice_flows -> ice_floes "floes" looks so un-english ;) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread GunChleoc
Code LGTM, just 1 nit: "ice_flows" should be "ice_floes". Not compiled or tested. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-15700

Re: [Widelands-dev] Feature Freeze?

2016-06-28 Thread Tibor Bamhor
I think it is long overdue so please, make a decision somebody 2016-06-28 22:12 GMT+02:00 Fòram na Gàidhlig : > Now that we have the new sounds in, is it time for the feature freeze? > > ___ > Mailing list: https://launchpad.net/~widelands-dev >

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-06-28 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands. Commit message: Unify german spelled terrains to english spelling. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1570086 in widelands: "Unify terrain nam

[Widelands-dev] Feature Freeze?

2016-06-28 Thread Fòram na Gàidhlig
Now that we have the new sounds in, is it time for the feature freeze? ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.la

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

2016-06-28 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands-website/django1_8 into lp:widelands-website has been updated. Description changed to: Upgrade the website code to use Django 1.8 There are three text conflicts when merging which are caused by mixed indentations, IMHO. Especially the conflict i