[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1798297-locale-C into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1798297-locale-C into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1798297-locale-C/+merge/358364 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1798297-locale-C 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/django_staticfiles into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/django_staticfiles into lp:widelands-website has been updated. Description changed to: The problem i had when introducing django-star-ratings (https://wl.widelands.org/forum/topic/4389/) was a result of not implementing django's default behavior for static files (css, js, images), which was introduced many versions ago. Modern third party django-apps rely on this default behavior, and this is what had bitten me this time. On the server i have fixed this by configuring local_settings.py. This branch reflects the changes i did on the server, and some other related stuff. As a sideeffect, this solves also this bug :-) Main concepts of new static files handling: 1. Setting STATIC_ROOT to an absolute path where static files will be collected using the management command 'collectstatic'. This command needs executed if settings.DEBUG=False. 'collectstatic' searches all apps which are in INSTALLED_APPS for a folder called 'static' and copies, or symlink, all of it's content into STATIC_ROOT. https://docs.djangoproject.com/en/1.11/ref/contrib/staticfiles/#collectstatic 2. Different urls for static files and user uploaded files. 3. Use of the 'static' template tag in the templates to refer to static content (this is the main reason why this diff is that big) Differences to the current state on the server: 1. Using the collectstatic command from this branch collects static files in 'media/static_collected/' (on the server i used 'media/static_foreign', which was a bad name). Unchanged: Files uploaded by a user where still uploaded to 'media/[wlmaps|wlprofile|wlimages]'. The name of the link stays unchanged, so 'wlmedia/*'. Other things: 1. Moved own static files from 'media/' to 'mainpage/static/' or to the app (folder) where it belongs to. I am planning to do the same with the subfolders in 'templates/*' to have all things related to one app in one folder. So working e.g. on some things in pybb, pybb related css is found in 'pybb/static/css/' and templates will be in 'pybb/templates/pybb/*.html' 2. I found also 2 issues if one wants to setup the website from scratch. Those are fixed in https://bazaar.launchpad.net/~widelands-dev/widelands-website/django_staticfiles/revision/514 To get this in: 1. Set website maintenance 2. Remove the contents of 'media/static_foreign' to avoid merge conflicts 3. merge the branch 4. Remove setting of STATIC_ROOT or set it to the destination where you want to collect static files. Exchange variable 'bd' with USER_MEDIA_BASE_PATH. Remove the lines containing STATIC_MEDIA_PATH (this were useless at all, because prior only used in local_urls.py) 5. run 'python manage.py collectstatic -l' (the switch '-l' creates symlinks instead of copying the files) 6. Change the url which refers to static content to point to the folder of STATIC_ROOT 7. Unset website maintenance I will setup the alpha site for testing. For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/django_staticfiles/+merge/359345 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/django_staticfiles into 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/django_staticfiles into lp:widelands-website
Alpha is up and running :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/django_staticfiles/+merge/359345 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/django_staticfiles into 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/ferry into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ferry into lp:widelands has been updated. Description changed to: This is a feature for post-build20 of course, but it´s ready for (review and) testing now. It´ll need very extensive testing anyway due to the great economy engine changes. Ferries are a special kind of carrier that works on waterways and can transport only a ware, no workers. Waterways are built like roads. I pulled out common code for Roads and Waterways into a base class RoadBase. Ferries are distributed to waterways by fleets. They are built in a ferry yard by a shipwright (build costs still need discussion). I solved the big problem of having separate road networks connected only by ferries with an overhaul of the entire economy concept. Each PlayerImmovable, Worker etc now has one Economy for wares and one for workers. They are completely independent of each other. This change breaks saveloding compatibility. The AI works fine (though it is completely unaware of the existence of ferries and waterways), but someone should check the changed code parts nonetheless. I added some TODOs in the places I touched. Ferries are enabled only for maps in which the key waterway_max_length is set to >= 2 in the port_spaces packet. There´s no GUI yet; defaults to 0 (= disabled). For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ferry 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-website/django_staticfiles into lp:widelands-website
I found some strange inconsistencies in the alpha database, which i want to fix. So alpha is down again. -- https://code.launchpad.net/~widelands-dev/widelands-website/django_staticfiles/+merge/359345 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/django_staticfiles into 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/bug-1796364-blinking-buildings into lp:widelands
Continuous integration builds have changed state: Travis build 4280. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/459059413. Appveyor build 4074. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1796364_blinking_buildings-4074. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1796364-blinking-buildings/+merge/359348 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1796364-blinking-buildings 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/travis-skip-translations-in-debug-builds into lp:widelands
Continuous integration builds have changed state: Travis build 4281. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/459060026. Appveyor build 4075. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_travis_skip_translations_in_debug_builds-4075. -- https://code.launchpad.net/~widelands-dev/widelands/travis-skip-translations-in-debug-builds/+merge/359347 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-skip-translations-in-debug-builds 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/ferry into lp:widelands
Hm... I´m found one remaining crash in this branch during loading a saved game. Sometimes it works, rarely it crashes directly after loading, and most time it crashes with a segfault while loading the waterwaydata packet. The strange thing is that the segfault always occurs in a different function. I have no idea how to debug this, any help would be appreciated... -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ferry 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-website/django_staticfiles into lp:widelands-website
Alpha is up again... -- https://code.launchpad.net/~widelands-dev/widelands-website/django_staticfiles/+merge/359345 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/django_staticfiles into 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
