Issue 228 fixed #259
Issue 228 fixed #259
Conversation
…- to be tested)
|
At last ! After a lot of struggle with GitHub desktop I managed to create a PR from my local issue-228-fixed branch to upstream:delete-confirmation. |
|
What license applies to the icons? |
|
It's the standard icons shipped with JavaFX so they have the same licence as the framework itself |
|
Is there any way to use them without re-bundling them? |
|
They are normally bundled in a javafx-ui jar along the CSS files. We could include this jar in the project but we would have to manage the css priority between the files in the jar and the ones within cryptomator. |
|
Oh ok I see, css and images have to be in the same jar in order to make |
|
The icons are in the javafxrt.jar, we should be able to use them to without puting them within cryptomator. How come cryptomatir doesn't use the default CSS ressources ? Because adding the CSS code wasn't enough to have the icons showing up, this is why I rebundled them |
| @@ -13,6 +13,9 @@ main.directoryList.contextMenu.remove=Remove from list | |||
| main.directoryList.contextMenu.changePassword=Change password | |||
| main.addDirectory.contextMenu.new=Create new vault | |||
| main.addDirectory.contextMenu.open=Open existing vault | |||
| main.directoryList.remove.confirmation.title=Vault removal | |||
| main.directoryList.remove.confirmation.header=Do you really want to remove this vault ? | |||
| main.directoryList.remove.confirmation.content=Every data it contains will be lost. | |||
There was a problem hiding this comment.
This file doesn't exist any longer in master, as we switched from .properties files to unicode .txt files due to charset issues with non-latin alphabets.
Please merge from master and put the new strings into src/main/resources/localization/en.txt
|
From a licence point of view, isn't a rebundle the same as using the default components ? |
|
In our "native" bundles all libraries stay separated, so we can prove to just "use" them. The only exception is the "fat jar" in GitHub Releases, which mixes all classes together. Technically this remixing may cause issues if licenses prohibit such things. However JavaFX is licensed under the Oracle BCL. I am not sure, to what extent parts of the software can be re-packaged. Depending on the mood of lawyers repackaging might be a "modification" and not just a "use" of provided resources. Edit: OpenJFX is licensed under GPL terms. This means if we redistribute parts of the code (or in this case images), Cryptomator as a whole becomes GPL-licensed. But we want to stick with the MIT license, as we consider it less restrictive. |
|
I merged upstream:master, is the content of the pull request ok now ? |
| @@ -11,3 +11,33 @@ | |||
| .classpath | |||
| target/ | |||
| test-output/ | |||
| .idea/compiler.xml | |||
|
Can you somehow untrack |
|
I tried to remove them from within intellij but to no avail. I'll try the solution in your link ! |
|
Ahem, the git -rm fucked up my project setup, I had to reconfigure a new project within intellij. |
|
So far there is no new commit visible in this PR. The last commits I can see are the following ones:
|
|
Still need to check license of icons, will discuss this with @MuscleRumble, who has a lot of icons that we bought the license for. If necessary we will change them. |
|
Sounds good :) |
|
Hi Sebastian, Do you have any plans for a "contributors" page so we could be eligible to the IntelliJ licence for Open Source projects ? And thanks for the merge by the way ! Best regards
|
|
What exactly does the IntelliJ license need us to do? Have we used any IntelliJ material? Currently we just have the contributors page on GitHub, but we plan to add some pages to the website anyway. |
|
I'm using IntelliJ and they have free licences for open source projects : https://www.jetbrains.com/buy/opensource/?product=idea |
|
Ok I will see, if we can add a team/contributors page this week. However I see a problem with the conditions:
As you know, our iOS app is a paid app - don't know if this works... |
|
the ios app in in another project, I hope they won't care. |
|
@jncharon added github contributors onto our website: https://cryptomator.org/team/ However we want to emphasize that in our opinion the MIT license is not compatible to the conditions of IntelliJ. As long as you publish source code under the MIT license (otherwise we would reject it) the rules of the MIT license apply. If your IDE forbids creation of non-copyleft code, don't use it or don't tell me 😉 |
|
The iOS app is a separate project and we won't use Idea for it. If I'm not eligible it won't be a big deal, I'll just buy a personal licence ! |
|
The iOS app is not the problem, but the MIT license doesn't restrict the commercial use of the desktop app either. For example we're planning to offer payed service for the desktop app. People are considered to be contributors, as soon as they have code merged into the project (i.e. pull requests). Bug reporters are not contributors. We get this data via JSONP directly from the GitHub API. They make the rules ;) |
|
Oh, it's weird I'm not in the list despite my two merged pull requests 😕 |
|
Uhm... you are: API: https://api.github.com/repos/cryptomator/cryptomator/contributors |
|
My bad, the browser didn't display this area until I cleaned the cache. Not it's okay ! 👍 |
Confirmation dialog upon vault removal