Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
## Version 5.0.0 (2020-09-23)
**Most interesting changes since v4.4.0:**
### Enhancements
- New Polish translation! (Thanks, [@JachuPL](https://github.com/JachuPL)!) ([#83](https://github.com/jotoeri/git-it-electron/pull/83))
- New Polish translation! (Thanks, [@JachuPL](https://github.com/JachuPL)!) ([#83](https://github.com/Git-it-App/git-it-electron/pull/83))
- New German translation!
- Moved translations from separate files to i18next and Transifex, making it possible to track and translate content-changes ([#13](https://github.com/jotoeri/git-it-electron/pull/13))
- Moved translations from separate files to i18next and Transifex, making it possible to track and translate content-changes ([#13](https://github.com/Git-it-App/git-it-electron/pull/13))
- New link to a nice GUI-overview [jlord/#257](https://github.com/jlord/git-it-electron/pull/257)

### Fixes
- Fixed path to GitHub collaborator-settings ([#87](https://github.com/jotoeri/git-it-electron/pull/87))
- Fix: Changed Git-installation to pure Git without GitHub-Desktop ([#76](https://github.com/jotoeri/git-it-electron/pull/76))
- Cleaned up build, removed unused files ([#75](https://github.com/jotoeri/git-it-electron/pull/75))
- Fixed challenge-verifications, replaced deprecated request with axios ([#9](https://github.com/jotoeri/git-it-electron/pull/9))
- Fixed js-error on repository-link ([#5](https://github.com/jotoeri/git-it-electron/pull/5))
- Fixed standard-linting ([#4](https://github.com/jotoeri/git-it-electron/pull/4))
- Fixed path to GitHub collaborator-settings ([#87](https://github.com/Git-it-App/git-it-electron/pull/87))
- Fix: Changed Git-installation to pure Git without GitHub-Desktop ([#76](https://github.com/Git-it-App/git-it-electron/pull/76))
- Cleaned up build, removed unused files ([#75](https://github.com/Git-it-App/git-it-electron/pull/75))
- Fixed challenge-verifications, replaced deprecated request with axios ([#9](https://github.com/Git-it-App/git-it-electron/pull/9))
- Fixed js-error on repository-link ([#5](https://github.com/Git-it-App/git-it-electron/pull/5))
- Fixed standard-linting ([#4](https://github.com/Git-it-App/git-it-electron/pull/4))
- Bumped **all dependencies**, and especially:
- Electron from v1.4.3 to v10.1.1
- Electron-Packager from v8.0.0 to v15.1.0
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)

Contributions are more than welcome! Checkout e.g. the [good first issue](https://github.com/jotoeri/git-it-electron/labels/good%20first%20issue) label for ideas!
Contributions are more than welcome! Checkout e.g. the [good first issue](https://github.com/Git-it-App/git-it-electron/labels/good%20first%20issue) label for ideas!

---

Expand All @@ -22,7 +22,7 @@ Changes to the content of the pages must be made in the `resources/content` dire
If you want to build this locally you'll need [Node.js](https://nodejs.org) on your computer. Then clone this repository, install dependencies and launch the app:

```bash
$ git clone https://github.com/jotoeri/git-it-electron
$ git clone https://github.com/Git-it-App/git-it-electron
$ cd git-it-electron
$ npm install
$ npm start
Expand All @@ -47,7 +47,7 @@ $ npm -v
Clone this repository and install the dependencies:

```bash
$ git clone https://github.com/jotoeri/git-it-electron
$ git clone https://github.com/Git-it-App/git-it-electron
$ cd git-it-electron
$ npm install
```
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Git-it (Desktop App)

[![Build Status](https://travis-ci.com/jotoeri/git-it-electron.svg?branch=master)](https://travis-ci.com/jotoeri/git-it-electron) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![Translations missing](https://img.shields.io/badge/translations-missing%3A_fr_es_ja_ko_pt_uk_zh-critical)](https://www.transifex.com/git-it/git-it-electron)
[![Build Status](https://travis-ci.org/Git-it-App/git-it-electron.svg?branch=master)](https://travis-ci.org/Git-it-App/git-it-electron) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![Translations missing](https://img.shields.io/badge/translations-missing%3A_fr_es_ja_ko_pt_uk_zh-critical)](https://www.transifex.com/git-it/git-it-electron)

![The app](assets/screenshots/app.png)
Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface).

**🚩The app includes translations in several languages: English, German, Spanish, French, Japanese, Korean, Polish, Portuguese, Ukrainian and traditional Chinese. 🚩**
_Due to Code-Changes on handling translations, some translations are currently not visible as translated. The translations still need to be copied over to transifex, contributions are welcome! (see section 'Translations' and [#77](https://github.com/jotoeri/git-it-electron/issues/77))_
_Due to Code-Changes on handling translations, some translations are currently not visible as translated. The translations still need to be copied over to transifex, contributions are welcome! (see section 'Translations' and [#77](https://github.com/Git-it-App/git-it-electron/issues/77))_

**The app was originally created by Jessica Lord ([jlord](https://github.com/jlord)) and it's current state is still strongly dependent on her Repositories and the operation of Reporobot on her servers. As the app seemed to be unmaintained, i ([jotoeri](https://github.com/jotoeri)) took it over to update dependencies and content, as it would have been a pity to see such a great tutorial die. However, i am willing to transfer it back to Jessica if she wants.**
**The app was originally created by Jessica Lord ([jlord](https://github.com/jlord)) and it's current state is still strongly dependent on her Repositories and the operation of Reporobot on her servers. As the app seemed to be unmaintained, i ([jotoeri](https://github.com/jotoeri)) took it over and moved it to this organisation to update dependencies and content. It would just have been a pity to see such a great tutorial die. However, i am willing to transfer the Repository back to Jessica if she wants.**

---
## Hello future Forkers, Branchers and Pull Requesters!
Expand All @@ -35,7 +35,7 @@ I'm quite partial (I'm on the team!) but [Atom](http://atom.io) is a great text

#### Git-it

You can view the [releases](http://github.com/jotoeri/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux:
You can view the [releases](http://github.com/Git-it-App/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux:

![executables](assets/screenshots/install.png)

Expand All @@ -49,7 +49,7 @@ Open Git-it and click the button to begin the first challenge. Have your termina

When you've completed the steps in a challenge click 'Verify'. Depending on the challenge you may need to also select the folder you did your work in for Git-it to verify.

**Questions?** [Open an issue](http://github.com/jotoeri/git-it-electron/issues/new) on this repository.
**Questions?** [Open an issue](http://github.com/Git-it-App/git-it-electron/issues/new) on this repository.

**Want to contribute or build locally?** See the [contributing documentation](CONTRIBUTING.md)

Expand Down
4 changes: 2 additions & 2 deletions menus/darwin-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ module.exports = function (mainWindow, i18n) {
{
label: i18n.t('menu~App Repository'),
click: function () {
require('electron').shell.openExternal('http://github.com/jotoeri/git-it-electron')
require('electron').shell.openExternal('http://github.com/Git-it-App/git-it-electron')
}
},
{
label: i18n.t('menu~Open Issue'),
click: function () {
require('electron').shell.openExternal('https://github.com/jotoeri/git-it-electron/issues/new')
require('electron').shell.openExternal('https://github.com/Git-it-App/git-it-electron/issues/new')
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions menus/other-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ module.exports = function (mainWindow, i18n) {
{
label: i18n.t('menu~App Repository'),
click: function () {
require('electron').shell.openExternal('https://github.com/jotoeri/git-it-electron')
require('electron').shell.openExternal('https://github.com/Git-it-App/git-it-electron')
}
},
{
label: i18n.t('menu~Open Issue'),
click: function () {
require('electron').shell.openExternal('https://github.com/jotoeri/git-it-electron/issues/new')
require('electron').shell.openExternal('https://github.com/Git-it-App/git-it-electron/issues/new')
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"license": "BSD-2-Clause",
"repository": {
"type": "git",
"url": "https://github.com/jotoeri/git-it-electron.git"
"url": "https://github.com/Git-it-App/git-it-electron.git"
},
"bugs": {
"url": "https://github.com/jotoeri/git-it-electron/issues"
"url": "https://github.com/Git-it-App/git-it-electron/issues"
},
"homepage": "https://github.com/jotoeri/git-it-electron",
"homepage": "https://github.com/Git-it-App/git-it-electron",
"keywords": [
"Git",
"GitHub",
Expand Down
2 changes: 1 addition & 1 deletion resources/content/pages/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ <h4 i18n-data="about~The Code that Made Git-it"></h4>
i18n-data="about~This app is built with HTML, CSS and JS and uses the {/lnk_electron/}Electron{/lnk_e/} library. All of the code for Git-it is online in its {/lnk_repo/}repository on GitHub{/lnk_e/}. Git-it is a labor of love, originally created by Jessica Lord ({/lnk_jlord/}@jlord{/lnk_e/}) and kind contributors."
i18n-options='{
"lnk_electron": "http://electron.atom.io",
"lnk_repo": "http://github.com/jotoeri/git-it-electron",
"lnk_repo": "http://github.com/Git-it-App/git-it-electron",
"lnk_jlord": "https://jlord.us"
}'></p>