Re: License for generated file

2020-05-19 Thread Ivan Romanov
IANA doesn't provide any licesnse info. Anyway how to apply license to CSV file? I not sure that CSV format supports comments. Also seems now I must add another script to modify downloaded CSV file or add instruction how to modify this file to satisfy all policies. > El dimarts, 19 de maig de 2020

Re: Fw: Re: Adding the Abstract Games Suite to the KDE Applications

2020-05-19 Thread The Abstract Developers
Hi! Ok then, it appears I was mistaken about the icons. Sorry... So I relicensed again the Abstract Games under GPL 3 for the time being, and removed the SameGame application which used BSD 3-Clause code from the Qt examples. We also changed the X/O icons in TicTacToe which were from a Qt examp

Re: License for generated file

2020-05-19 Thread Albert Astals Cid
El dimarts, 19 de maig de 2020, a les 17:12:16 CEST, Ivan Romanov va escriure: > Tried to fix. > https://invent.kde.org/libraries/qca/-/commit/b69aab24315cc6821cc1da928e95cc0a4c42e311 > Now enough good? Not sure, what's the license of the csv file? Given it comes from iana, are we sure we can dis

Re: License for generated file

2020-05-19 Thread Ivan Romanov
Tried to fix. https://invent.kde.org/libraries/qca/-/commit/b69aab24315cc6821cc1da928e95cc0a4c42e311 Now enough good? On Tue, 19 May 2020 00:09:32 +0200 Albert Astals Cid wrote: > El dilluns, 18 de maig de 2020, a les 23:55:11 CEST, Johan Ouwerkerk > va escriure: > > On Mon, May 18, 2020 at 8:59

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Ben Cooksley
On Tue, May 19, 2020 at 9:05 PM Ralf Habacker wrote: > > Am 19.05.20 um 10:10 schrieb Tomaz Canabrava: > > By default Gitlab will create merge commits, and this can create a > > really nasty history if a branch is based on a branch and not in > > master. To overcome this, please - if you own a re

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Ralf Habacker
Am 19.05.20 um 10:10 schrieb Tomaz Canabrava: By default Gitlab will create merge commits, and this can create a really nasty history if  a branch is based on a branch and not in master. To overcome this, please - if you own a repository - go to the repository settings, Merge Requests, Fast For

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Tomaz Canabrava
Ah, you are a saint <3 On Tue, May 19, 2020 at 10:20 AM Bhushan Shah wrote: > Hi Tomaz, > > On Tue, May 19, 2020 at 10:10:41AM +0200, Tomaz Canabrava wrote: > > By default Gitlab will create merge commits, and this can create a really > > nasty history if a branch is based on a branch and not

Re: Apps Update for May

2020-05-19 Thread Luigi Toscano
Nate Graham ha scritto: > On 5/15/20 4:56 AM, Jonathan Riddell wrote: >> Announcing the release service releases is what makes it shift date each >> month.  We could separate them but then would the release service >> announcements go back to being a product which is what the intention is to >> avo

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Bhushan Shah
Hi Tomaz, On Tue, May 19, 2020 at 10:10:41AM +0200, Tomaz Canabrava wrote: > By default Gitlab will create merge commits, and this can create a really > nasty history if a branch is based on a branch and not in master. To > overcome this, please - if you own a repository - go to the repository >

Gitlab, Git History and Merge Options

2020-05-19 Thread Tomaz Canabrava
By default Gitlab will create merge commits, and this can create a really nasty history if a branch is based on a branch and not in master. To overcome this, please - if you own a repository - go to the repository settings, Merge Requests, Fast Forward Merge. I see that a few repositories are alr