Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: brailleapps/dotify-studio-installer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mtmse/dotify-studio-installer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on May 3, 2017

  1. Adds mtm-dotify-addons to plugins

    Joel Håkansson committed May 3, 2017
    Copy the full SHA
    23132ea View commit details

Commits on Jun 29, 2017

  1. Updates from upstream

    Joel Håkansson committed Jun 29, 2017
    Copy the full SHA
    ad3658b View commit details
  2. Updates mtm-dotify-addons to v2.3.0

    Joel Håkansson committed Jun 29, 2017
    Copy the full SHA
    4416ecc View commit details

Commits on Aug 30, 2017

  1. Updates from upstream

    Joel Håkansson committed Aug 30, 2017
    Copy the full SHA
    92bd268 View commit details

Commits on Sep 14, 2017

  1. Updates from upstream

    Joel Håkansson committed Sep 14, 2017
    Copy the full SHA
    8207022 View commit details

Commits on Feb 21, 2018

  1. Updates from upstream

    Joel Håkansson committed Feb 21, 2018
    Copy the full SHA
    62879ff View commit details
  2. Updates from upstream

    Joel Håkansson committed Feb 21, 2018
    Copy the full SHA
    e815a78 View commit details
  3. Updates from upstream

    Joel Håkansson committed Feb 21, 2018
    Copy the full SHA
    a6a92db View commit details
  4. Updates from upstream

    Joel Håkansson committed Feb 21, 2018
    Copy the full SHA
    26d18b7 View commit details
  5. Updates mtm-dotify-addons to v3.0.0

    Joel Håkansson committed Feb 21, 2018
    Copy the full SHA
    5602f19 View commit details

Commits on Mar 1, 2018

  1. Updates from upstream

    Joel Håkansson committed Mar 1, 2018
    Copy the full SHA
    23f38b1 View commit details

Commits on Apr 19, 2018

  1. Updates from upstream

    Joel Håkansson committed Apr 19, 2018
    Copy the full SHA
    c647d38 View commit details

Commits on Apr 27, 2018

  1. Updates from upstream

    Joel Håkansson committed Apr 27, 2018
    Copy the full SHA
    7213cf3 View commit details

Commits on May 28, 2018

  1. Updates from upstream

    Joel Håkansson committed May 28, 2018
    Copy the full SHA
    12a283f View commit details

Commits on Aug 21, 2018

  1. Updates from upstream

    Joel Håkansson committed Aug 21, 2018
    Copy the full SHA
    7c51385 View commit details
  2. Adds plugins to javapackager for Windows

    Joel Håkansson committed Aug 21, 2018
    Copy the full SHA
    1cef9bf View commit details

Commits on Mar 22, 2019

  1. Updates from upstream

    Joel Håkansson authored and joeha480 committed Mar 22, 2019
    Copy the full SHA
    579644a View commit details

Commits on Jun 4, 2019

  1. Updates from upstream

    joeha480 committed Jun 4, 2019
    Copy the full SHA
    1756e43 View commit details
  2. Copy the full SHA
    44eeba2 View commit details

Commits on Oct 22, 2019

  1. Copy the full SHA
    4662903 View commit details
  2. Merge pull request #1 from mtmse/code-of-conduct

    Create CODE_OF_CONDUCT.md
    fredrikschill authored Oct 22, 2019
    Copy the full SHA
    6b2975d View commit details
Showing with 90 additions and 1 deletion.
  1. +81 −0 CODE_OF_CONDUCT.md
  2. +9 −1 build.gradle
81 changes: 81 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Dotify Code of Conduct

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

All Dotify forums and spaces are meant for professional interactions,
and any behavior which could reasonably be considered inappropriate in
a professional setting is unacceptable.

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at Fredrik Schill (fredrik@textalk.se) and
Daniel Persson (daniel.persson@textalk.se). All complaints will be reviewed and
investigated and will result in a response that is deemed necessary and appropriate
to the circumstances. The project team is obligated to maintain confidentiality with
regard to the reporter of an incident.Further details of specific enforcement
policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq

This Code of Conduct also includes some aspects of the TensorFlow Code of Conduct.
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -26,6 +26,9 @@ dependencies {
app ("org.daisy.dotify:$artifactName:$version@zip") {
transitive false
}
appPlugins ('se.mtm.addons:mtm-dotify-addons:4.0.0') {
transitive false
}
}

task unzip(type: Copy, description: 'Unzips the distribution to a temporary folder.') {
@@ -51,6 +54,11 @@ task copyPlugins(type: Copy, dependsOn: 'unzip', description: 'Copies additional
into file("${appBase}/lib/plugins")
}

task copyPluginsFlatLib(type: Copy, dependsOn: 'unzipFlatLib', description: 'Copies additional jars to the plugins folder (requires editing of build.gradle)') {
from configurations.appPlugins
into file("${appBase}/plugins")
}

def modifyPath(def path) {
def modified=path.replaceAll('\\Adotify-studio[^/]*(.+)', {"dotify-studio${it[1]}"})
return modified
@@ -237,7 +245,7 @@ ext.runJavaPackager = { bundles, appIcon, appName ->

}

task jpMsi(dependsOn: 'deleteBinFlatLib', description: 'Uses javapackager to create msi installer (experimental).') {
task jpMsi(dependsOn: ['deleteBinFlatLib', 'copyPluginsFlatLib'], description: 'Uses javapackager to create msi installer (experimental).') {
doLast() {
runJavaPackager('msi', file('build-resources/app-icon.ico').getAbsolutePath(), 'dotify-studio')
}