Skip to content

Commit

Permalink
Doc: Changed GitHub links from master to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Oct 11, 2020
1 parent 4265b3a commit b6a0040
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ If it's not related to any platform (such as a translation, change to the docume

Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.

AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md

-->
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you want to start contributing to the project's code, please follow these gui
- All the applications share the same backend (database, synchronisation, settings, models, business logic, etc.) so if you change something in the backend in one app, makes sure it still work in the other apps. Usually it does, but keep this in mind.
- Pull requests that make many changes using an automated tool, like for spell fixing, styling, etc. will not be accepted. An exception would be if the changes have been discussed in the forum and someone has agreed to review **and test** the pull request.

Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/dev/BUILD.md) for more details.

## Coding style

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

* * *

<img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/master/Assets/LinuxIcons/256x256.png" align="left" /> **Joplin** is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](#markdown).
<img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" /> **Joplin** is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](#markdown).

Notes exported from Evernote via .enex files [can be imported](#importing) into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.

Expand All @@ -22,7 +22,7 @@ Operating System | Download | Alternative
-----------------|--------|-------------------
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.2.6/Joplin-Setup-1.2.6.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.2.6/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.2.6/Joplin-1.2.6.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew (unsupported): `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.2.6/Joplin-1.2.6.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package (unsupported) [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.2.6/Joplin-1.2.6.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package (unsupported) [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh \| bash`

## Mobile applications

Expand Down Expand Up @@ -100,7 +100,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
- [Note History spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md)
- [Sync Lock spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md)
- [Plugin Architecture spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md)
- [Search Sorting spec](https://github.com/laurent22/joplin/blob/master/readme/spec/search_sorting.md)
- [Search Sorting spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md)

- Google Summer of Code 2020

Expand Down Expand Up @@ -398,7 +398,7 @@ Please see the guide for information on how to contribute to the development of
Joplin is currently available in the languages below. If you would like to contribute a **new translation**, it is quite straightforward, please follow these steps:

- [Download Poedit](https://poedit.net/), the translation editor, and install it.
- [Download the file to be translated](https://raw.githubusercontent.com/laurent22/joplin/master/CliClient/locales/joplin.pot).
- [Download the file to be translated](https://raw.githubusercontent.com/laurent22/joplin/dev/CliClient/locales/joplin.pot).
- In Poedit, open this .pot file, go into the Catalog menu and click Configuration. Change "Country" and "Language" to your own country and language.
- From then you can translate the file.
- Once it is done, please [open a pull request](https://github.com/laurent22/joplin/pulls) and add the file to it.
Expand Down
2 changes: 1 addition & 1 deletion ReactNativeClient/lib/joplin-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "joplin-renderer",
"version": "1.0.8",
"description": "The Joplin note renderer, used the mobile and desktop application",
"repository": "https://github.com/laurent22/joplin/tree/master/ReactNativeClient/lib/joplin-renderer",
"repository": "https://github.com/laurent22/joplin/tree/dev/ReactNativeClient/lib/joplin-renderer",
"main": "index.js",
"scripts": {
"test": "jasmine --config=tests/support/jasmine.json",
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Only the latest version is supported with security updates.

## Reporting a Vulnerability

Please [contact support](https://raw.githubusercontent.com/laurent22/joplin/master/Assets/AdresseSupport.png) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.
Please [contact support](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/AdresseSupport.png) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.

For general opinions on what makes an app more or less secure, please use the forum.
2 changes: 1 addition & 1 deletion Tools/build-translation.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ function flagImageUrl(locale) {
}

function poFileUrl(locale) {
return `https://github.com/laurent22/joplin/blob/master/CliClient/locales/${locale}.po`;
return `https://github.com/laurent22/joplin/blob/dev/CliClient/locales/${locale}.po`;
}

function translationStatusToMdTable(status) {
Expand Down
4 changes: 2 additions & 2 deletions Tools/build-website.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This file was auto-generated from {{{sourceMarkdownFile}}} and any manual change
made to it will be overwritten. To make a change to this file please modify
the source Markdown file:
https://github.com/laurent22/joplin/blob/master/{{{sourceMarkdownFile}}}
https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
-->
Expand Down Expand Up @@ -489,7 +489,7 @@ function markdownToHtml(md, templateParams) {

const improveDocHtml = `
<div class="bottom-links">
<a href="https://github.com/laurent22/joplin/blob/master/{{{sourceMarkdownFile}}}">
<a href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
<i class="fa fa-github"></i> Improve this doc
</a>
</div>`;
Expand Down
2 changes: 1 addition & 1 deletion readme/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Some crashes cannot be investigated using Joplin's own tools. In that case, it c

For this, please follow these instructions:

You can send it to this address https://raw.githubusercontent.com/laurent22/joplin/master/Assets/AdresseSupport.png
You can send it to this address https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/AdresseSupport.png

https://developer.apple.com/library/content/qa/qa1747/_index.html

Expand Down
4 changes: 2 additions & 2 deletions readme/gsoc2020/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ The GUI's, as listed on the [Joplin's website](https://joplinapp.org/#installati

More details can be found on:

- [How to contribute](https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md)
- [How to build](https://github.com/laurent22/joplin/blob/master/BUILD.md)
- [How to contribute](https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md)
- [How to build](https://github.com/laurent22/joplin/blob/dev/BUILD.md)

Moreover there are community driven projects such as:

Expand Down

0 comments on commit b6a0040

Please sign in to comment.