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

2016-02-29 Thread bunnybot
Continuous integration builds have changed state: Travis build 725. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109937395. Appveyor build 572. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_listselect-5

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

2016-02-29 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: HTTP Error 500: Internal Server Error -- https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-29 Thread TiborB
Review: Approve OK, no sense to keep it waiting, especially if you dont know how to fix that other bug. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546095-

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

2016-02-29 Thread TiborB
Review: Approve looks harmless -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1542705. ___ Mailing list: https://launchpad.net/~wi

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

2016-02-29 Thread TiborB
Review: Approve I formally approve this, but I am not able to review the values. Whenever you (or guys in forum) feel that it is ready, feel free to merge it -- https://code.launchpad.net/~widelands-dev/widelands/tree-values/+merge/287401 Your team Widelands Developers is subscribed to branch l

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

2016-02-29 Thread GunChleoc
My idea is to generate them on the server - I have added a call to the executable in update_help.py. It will also run a python script that checks for basic JSON validity. My idea is that they aren't part of the Widelands installation as such and that they shouldn't be packaged, so I prefer to g

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

2016-02-29 Thread SirVer
Review: Approve must not be merged before the corresponding WL branch is deployed on the website. lgtm to me in general, though I did not test it. What is the plan for generating the JSON files? It seems you expect them to be dumped into the JSON directory in the repo - do you want to check t

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands

2016-02-29 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1513181-chat-overlay/+merge/287135 -- Your team Widelands Developers i

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

2016-02-29 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/employers into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/employers/+merge/287384 -- Your team Widelands Developers is subscribed to branch lp:~wi

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

2016-02-29 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/map_object_info into lp:widelands has been updated. Commit Message changed to: Created a new executable that will generate JSON files for updating the encyclopedia on the website. For more details, see: https://code.launchpad.net/~widelands-dev

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip into lp:widelands

2016-02-29 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1548932-editor-save-zip into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip/+merge/287036 -- Your team Widela

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

2016-02-29 Thread GunChleoc
OK, thanks for letting me know. Good luck with the move! -- https://code.launchpad.net/~widelands-dev/widelands/employers/+merge/287384 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/employers. ___ Mailing list: http

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

2016-02-29 Thread SirVer
Review: Approve lgtm. @bunnybot merge Two unrelated things: We are running out of inodes on the server due to bunnybot. The more branches there are for merging, the worse the problem - I estimate we can have 18 before we run into serious trouble. I am working with strato to figure out a way

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1513181-chat-overlay into lp:widelands

2016-02-29 Thread SirVer
Review: Approve lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1513181-chat-overlay/+merge/287135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1513181-chat-overlay. ___ Mai