Skip to content

Commit 9ab7467

Browse files
committed
git: switch to main branch from master
Signed-off-by: Patrizio Bekerle <[email protected]>
1 parent dccd57f commit 9ab7467

File tree

13 files changed

+29
-29
lines changed

13 files changed

+29
-29
lines changed

.github/workflows/generate-index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Generate script metadata index
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66

77
jobs:
88
build:

.github/workflows/run-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Run tests
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
build:

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
[IRC Chat](https://kiwiirc.com/client/irc.freenode.net/#qownnotes) |
99
[Gitter Chat](https://gitter.im/qownnotes/qownnotes)
1010

11-
[![Run tests](https://github.com/qownnotes/scripts/workflows/Run%20tests/badge.svg?branch=master)](https://github.com/qownnotes/scripts/actions)
12-
[![Build Status](https://travis-ci.org/qownnotes/scripts.svg?branch=master)](https://travis-ci.org/qownnotes/scripts)
11+
[![Run tests](https://github.com/qownnotes/scripts/workflows/Run%20tests/badge.svg?branch=main)](https://github.com/qownnotes/scripts/actions)
12+
[![Build Status](https://travis-ci.org/qownnotes/scripts.svg?branch=main)](https://travis-ci.org/qownnotes/scripts)
1313
[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/qownnotes/qownnotes)
1414

1515
Here you will find the scripts you can directly access in [QOwnNotes](http://www.qownnotes.org), the plain-text file notepad with markdown support and Nextcloud and ownCloud integration.
@@ -26,7 +26,7 @@ To bring your script into the **script repository** you just have to do the foll
2626
- **add your script** to the folder and remove the `example-script.qml`
2727
- **edit** the **`info.json`** to add your meta data and describe what your script is doing
2828
- you can use [example script info.json](https://jsoneditoronline.org/?url=https%3A%2F%2Fraw.githubusercontent.com%2Fqownnotes%2Fscripts%2Fmaster%2Fexample-script%2Finfo.json) to help you with the json encoding
29-
- if you are not sure which `minAppVersion` the commands you are using needs take the [current version](https://github.com/pbek/QOwnNotes/blob/master/src/version.h) of _QOwnNotes_
29+
- if you are not sure which `minAppVersion` the commands you are using needs take the [current version](https://github.com/pbek/QOwnNotes/blob/main/src/version.h) of _QOwnNotes_
3030
- **commit and push** your changes to your repository
3131
- create a **[pull request](https://help.github.com/articles/creating-a-pull-request/)** to get your script merged into the QOwnNotes script repository
3232

@@ -41,14 +41,14 @@ When editing an existing script in the GitHub web interface, do the following:
4141
- In your fork, select the QML file to edit.
4242
- Make any desired changes.
4343
- Fill out the Commit changes fields.
44-
- If this is a personal fork, select 'Commit directly to master branch'.
44+
- If this is a personal fork, select 'Commit directly to main branch'.
4545
- Click **Commit changes** button.
4646
- Select the associated `info.json` (it will be in the same folder).
4747
- Add your name as an author.
4848
- Increase the version number.
4949
- Ensure the `minAppVersion` reflects the correct version needed (if using new features).
5050
- Make any other changes.
5151
- Fill out the Commit changes fields.
52-
- If this is a personal fork, select 'Commit directly to master branch'.
52+
- If this is a personal fork, select 'Commit directly to main branch'.
5353
- Click **Commit changes** button.
54-
- Create a pull request to qownnotes/scripts on the master branch.
54+
- Create a pull request to qownnotes/scripts on the main branch.

inbox/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"platforms": ["linux", "macos", "windows"],
88
"version": "0.2.2",
99
"minAppVersion": "17.05.8",
10-
"description": "Inbox is a complex script to organize data added from different devices and applications.\n\n<b>It's currently at beta stage, so using it for unrecoverable data is discouraged.</b>\n\nThe script processes files in inbox folder you set or whole note folder (depending on settings) as follows:\n- The script turns all .txt files and files with no extension to .md notes with modification time in the file name.\n- If there's a word that starts with a '@' (configurable) in .txt file, content of that file will be added to .md note named like that word. The content of .txt file with '@topic' in text will be added to 'topic.md' file. Outside of inbox folder the text won't be added to note but will become a new standalone note.\n- Every URL in text file will be converted to markdown link, with web page favicon and title if possible.\n- Any web page, saved as .htm file with '_files' folder, will be converted to .md note.\n- Any image file placed to inbox folder will be moved to media folder. The script will put .md note with the in-line image instead.\n- Any other file placed to inbox folder will be moved to attachments folder. The script will put .md note with a link to the file instead. On Linux the file icon will be put before link.\n- (Inbox folder only) Text/link of file placed to sub-folder of inbox folder will be added to .md note named like the sub-folder. Everything put to 'topic' sub-folder will be added to 'topic.md' file. Topic words won't work in these sub-folders.\n- (Linux only) The script will put thumbnail for .pdf file as a link to it.\n- (Linux only) The script will replace large in-line image with a smaller one as a link to original.\n\n <a href=\"https://github.com/qownnotes/scripts/blob/master/inbox/workflow.md\">Workflow examples</a>\n\n<b>Dependencies:</b>\n<a href=\"https://www.python.org/downloads/\">Python 3.3+ Interpreter</a>;\n(optional, continuous watch mode)<a href=\"http://pythonhosted.org/watchdog/installation.html\">Watchdog module</a>;\n(optional, web page to note)<a href=\"http://pandoc.org/installing.html\">Pandoc</a>;\n(optional, Linux only, pdf thumbnails) ghostscript;\n(optional, Linux only, image thumbnails) imagemagick;\n(optional, Linux only, file icons) python-gobject.\n\n<b>Usage:</b>\nRun the script by toolbar button or menu item. Or, if set to 'continuous watch' mode, it will run itself on load."
10+
"description": "Inbox is a complex script to organize data added from different devices and applications.\n\n<b>It's currently at beta stage, so using it for unrecoverable data is discouraged.</b>\n\nThe script processes files in inbox folder you set or whole note folder (depending on settings) as follows:\n- The script turns all .txt files and files with no extension to .md notes with modification time in the file name.\n- If there's a word that starts with a '@' (configurable) in .txt file, content of that file will be added to .md note named like that word. The content of .txt file with '@topic' in text will be added to 'topic.md' file. Outside of inbox folder the text won't be added to note but will become a new standalone note.\n- Every URL in text file will be converted to markdown link, with web page favicon and title if possible.\n- Any web page, saved as .htm file with '_files' folder, will be converted to .md note.\n- Any image file placed to inbox folder will be moved to media folder. The script will put .md note with the in-line image instead.\n- Any other file placed to inbox folder will be moved to attachments folder. The script will put .md note with a link to the file instead. On Linux the file icon will be put before link.\n- (Inbox folder only) Text/link of file placed to sub-folder of inbox folder will be added to .md note named like the sub-folder. Everything put to 'topic' sub-folder will be added to 'topic.md' file. Topic words won't work in these sub-folders.\n- (Linux only) The script will put thumbnail for .pdf file as a link to it.\n- (Linux only) The script will replace large in-line image with a smaller one as a link to original.\n\n <a href=\"https://github.com/qownnotes/scripts/blob/main/inbox/workflow.md\">Workflow examples</a>\n\n<b>Dependencies:</b>\n<a href=\"https://www.python.org/downloads/\">Python 3.3+ Interpreter</a>;\n(optional, continuous watch mode)<a href=\"http://pythonhosted.org/watchdog/installation.html\">Watchdog module</a>;\n(optional, web page to note)<a href=\"http://pandoc.org/installing.html\">Pandoc</a>;\n(optional, Linux only, pdf thumbnails) ghostscript;\n(optional, Linux only, image thumbnails) imagemagick;\n(optional, Linux only, file icons) python-gobject.\n\n<b>Usage:</b>\nRun the script by toolbar button or menu item. Or, if set to 'continuous watch' mode, it will run itself on load."
1111
}

llama-cpp-integration/llama-cpp-integration.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import QOwnNotesTypes 1.0
55
* This script provides integration for a local llama.cpp backend
66
* See: https://github.com/ggerganov/llama.cpp
77
* List of models: https://github.com/ggerganov/llama.cpp#description
8-
* OpenAPI endpoint: https://github.com/ggerganov/llama.cpp/blob/master/examples/server/README.md#result-json-1
8+
* OpenAPI endpoint: https://github.com/ggerganov/llama.cpp/blob/main/examples/server/README.md#result-json-1
99
*/
1010
Script {
1111
property string baseUrl

markdown-it/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
"authors": ["@milan-rusev", "@bessw", "@cjendantix"],
1111
"version": "1.5",
1212
"minAppVersion": "20.6.0",
13-
"description": "This script replaces the default markdown renderer with markdown-it and allows for optional LaTeX rendering support with the Markdown-It KaTeX plugin. (NOTE: LaTeX defaults to rendering with MathML ONLY). \n\n<b>Dependencies</b>\n<a href=\"https://github.com/markdown-it/markdown-it\">markdown-it.js</a> (v8.4.2 bundled with the script)\n<a href=\"https://github.com/mdit-plugins/mdit-plugins/tree/main/packages/katex\">Markdown-It KaTeX plugin</a> (v0.18.0 bundled with the script)\n\n<b>Usage</b>\nFor the possible configuration options check <a href=\"https://github.com/markdown-it/markdown-it/tree/master/lib/presets\">here</a>.\n\n<b>Important</b>\nThis script currently only works with <a href=\"https://github.com/qownnotes/scripts/issues/77\"><b>legacy media links</b></a>. You can turn them on in the <i>General Settings</i>.\n\nImportant note: You need to use legacy image linking with this script, otherwise there will be no images shown in the preview!"
13+
"description": "This script replaces the default markdown renderer with markdown-it and allows for optional LaTeX rendering support with the Markdown-It KaTeX plugin. (NOTE: LaTeX defaults to rendering with MathML ONLY). \n\n<b>Dependencies</b>\n<a href=\"https://github.com/markdown-it/markdown-it\">markdown-it.js</a> (v8.4.2 bundled with the script)\n<a href=\"https://github.com/mdit-plugins/mdit-plugins/tree/main/packages/katex\">Markdown-It KaTeX plugin</a> (v0.18.0 bundled with the script)\n\n<b>Usage</b>\nFor the possible configuration options check <a href=\"https://github.com/markdown-it/markdown-it/tree/main/lib/presets\">here</a>.\n\n<b>Important</b>\nThis script currently only works with <a href=\"https://github.com/qownnotes/scripts/issues/77\"><b>legacy media links</b></a>. You can turn them on in the <i>General Settings</i>.\n\nImportant note: You need to use legacy image linking with this script, otherwise there will be no images shown in the preview!"
1414
}

markdown-it/markdown-it.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -895,12 +895,12 @@
895895
* MarkdownIt provides named presets as a convenience to quickly
896896
* enable/disable active syntax rules and options for common use cases.
897897
*
898-
* - ["commonmark"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/commonmark.js) -
898+
* - ["commonmark"](https://github.com/markdown-it/markdown-it/blob/main/lib/presets/commonmark.js) -
899899
* configures parser to strict [CommonMark](http://commonmark.org/) mode.
900-
* - [default](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/default.js) -
900+
* - [default](https://github.com/markdown-it/markdown-it/blob/main/lib/presets/default.js) -
901901
* similar to GFM, used when no preset name given. Enables all available rules,
902902
* but still without html, typographer & autolinker.
903-
* - ["zero"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/zero.js) -
903+
* - ["zero"](https://github.com/markdown-it/markdown-it/blob/main/lib/presets/zero.js) -
904904
* all rules disabled. Useful to quickly setup your config via `.enable()`.
905905
* For example, when you need only `bold` and `italic` markup and nothing else.
906906
*
@@ -917,7 +917,7 @@
917917
* Can be useful for external highlighters.
918918
* - __linkify__ - `false`. Set `true` to autoconvert URL-like text to links.
919919
* - __typographer__ - `false`. Set `true` to enable [some language-neutral
920-
* replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.js) +
920+
* replacement](https://github.com/markdown-it/markdown-it/blob/main/lib/rules_core/replacements.js) +
921921
* quotes beautification (smartquotes).
922922
* - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement
923923
* pairs, when typographer enabled and smartquotes on. For example, you can
@@ -1043,15 +1043,15 @@
10431043
* md.renderer.rules['my_token'] = myToken
10441044
* ```
10451045
*
1046-
* See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js).
1046+
* See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/main/lib/renderer.js).
10471047
**/
10481048
this.renderer = new Renderer();
10491049

10501050
/**
10511051
* MarkdownIt#linkify -> LinkifyIt
10521052
*
10531053
* [linkify-it](https://github.com/markdown-it/linkify-it) instance.
1054-
* Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js)
1054+
* Used by [linkify](https://github.com/markdown-it/markdown-it/blob/main/lib/rules_core/linkify.js)
10551055
* rule.
10561056
**/
10571057
this.linkify = new LinkifyIt();
@@ -1094,15 +1094,15 @@
10941094
* MarkdownIt#utils -> utils
10951095
*
10961096
* Assorted utility functions, useful to write plugins. See details
1097-
* [here](https://github.com/markdown-it/markdown-it/blob/master/lib/common/utils.js).
1097+
* [here](https://github.com/markdown-it/markdown-it/blob/main/lib/common/utils.js).
10981098
**/
10991099
this.utils = utils;
11001100

11011101
/**
11021102
* MarkdownIt#helpers -> helpers
11031103
*
11041104
* Link components parser functions, useful to write plugins. See details
1105-
* [here](https://github.com/markdown-it/markdown-it/blob/master/lib/helpers).
1105+
* [here](https://github.com/markdown-it/markdown-it/blob/main/lib/helpers).
11061106
**/
11071107
this.helpers = utils.assign({}, helpers);
11081108

@@ -1143,7 +1143,7 @@
11431143
*
11441144
* Batch load of all options and compenent settings. This is internal method,
11451145
* and you probably will not need it. But if you with - see available presets
1146-
* and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)
1146+
* and data structure [here](https://github.com/markdown-it/markdown-it/tree/main/lib/presets)
11471147
*
11481148
* We strongly recommend to use presets instead of direct config loads. That
11491149
* will give better compatibility with next versions.
@@ -2187,7 +2187,7 @@
21872187
* }
21882188
* ```
21892189
*
2190-
* See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js)
2190+
* See [source code](https://github.com/markdown-it/markdown-it/blob/main/lib/renderer.js)
21912191
* for more details and examples.
21922192
**/
21932193
this.rules = assign({}, default_rules);

markdown-it/markdown-it.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ QtObject {
1212
{
1313
"identifier": "options",
1414
"name": "Markdown-it options",
15-
"description": "For available options and default values see <a href='https://github.com/markdown-it/markdown-it/blob/master/lib/presets'>markdown-it presets</a>.",
15+
"description": "For available options and default values see <a href='https://github.com/markdown-it/markdown-it/blob/main/lib/presets'>markdown-it presets</a>.",
1616
"type": "text",
1717
"default": "{" + "\n" + " //html: false, // Enable HTML tags in source" + "\n" + " //xhtmlOut: false, // Use '/' to close single tags (<br />)" + "\n" + " //breaks: false, // Convert '\\n' in paragraphs into <br>" + "\n" + " //langPrefix: 'language-', // CSS language prefix for fenced blocks" + "\n" + " //linkify: false, // autoconvert URL-like texts to links" + "\n" + "" + "\n" + " // Enable some language-neutral replacements + quotes beautification" + "\n" + " //typographer: false," + "\n" + "" + "\n" + " // Double + single quotes replacement pairs, when typographer enabled," + "\n" + " // and smartquotes on. Could be either a String or an Array." + "\n" + " //" + "\n" + " // For example, you can use '«»„“' for Russian, '„“‚‘' for German," + "\n" + " // and ['«\\xA0', '\\xA0»', '‹\\xA0', '\\xA0›'] for French (including nbsp)." + "\n" + " //quotes: '\\u201c\\u201d\\u2018\\u2019', /* “”‘’ */" + "\n" + "" + "\n" + " // Highlighter function. Should return escaped HTML," + "\n" + " // or '' if the source string is not changed and should be escaped externaly." + "\n" + " // If result starts with <pre... internal wrapper is skipped." + "\n" + " //" + "\n" + " // function (/*str, lang*/) { return ''; }" + "\n" + " //" + "\n" + " //highlight: null," + "\n" + "" + "\n" + " //maxNesting: 100 // Internal protection, recursion limit" + "\n" + "}"
1818
},

quick-commands/quick-commands.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Script {
5858
return timeList;
5959
}
6060

61-
// Taken from https://github.com/qownnotes/scripts/blob/master/journal-entry/journal-entry.qml
61+
// Taken from https://github.com/qownnotes/scripts/blob/main/journal-entry/journal-entry.qml
6262
function formatDate(date, format) {
6363
let day = date.getDate();
6464
let dayOfWeek = _SHORT_DAYS_EN[date.getDay()];
@@ -90,7 +90,7 @@ Script {
9090
return format;
9191
}
9292

93-
// Taken from https://github.com/qownnotes/scripts/blob/master/journal-entry/journal-entry.qml
93+
// Taken from https://github.com/qownnotes/scripts/blob/main/journal-entry/journal-entry.qml
9494
function getWeekNumber(d) {
9595
// Copy date so don't modify original
9696
d = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));

render-plantuml/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ This script for [QOwnNotes](https://www.qownnotes.org/) renders text based diagr
2424

2525
## Developpement
2626

27-
The script is developed on Github: https://github.com/qownnotes/scripts/tree/master/render-plantuml
27+
The script is developed on Github: https://github.com/qownnotes/scripts/tree/main/render-plantuml
2828

2929
Feel free to contribute.

0 commit comments

Comments
 (0)