Skip to content

Commit

Permalink
Merge branch 'main' into issue35rc
Browse files Browse the repository at this point in the history
  • Loading branch information
cxw42 committed Dec 31, 2021
2 parents 1c366b6 + cc2f6c4 commit 10bf616
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 125 deletions.
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

custom: ['https://paypal.me/tabfern']
35 changes: 27 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ CC-BY-SA 3.0, or any later version, at the option of the person using
your contribution. See [LICENSE.md](LICENSE.md) for the license text
and more details.

**Update 2019-09-30** Please do not use _any_ code or other content from
Please do not use _any_ code or other content from
Stack Overflow or any other Stack Exchange Web site. Explanation follows.
I hope to be able to remove this request in the near future!

Stack Exchange is currently going through a
[relicensing process](https://meta.stackexchange.com/q/333615/274096),
and has not provided information I need about licenses to Stack Exchange-hosted
In 2019, Stack Exchange (SE) went through a
[relicensing process](https://meta.stackexchange.com/q/333615/274096).
SE has not provided information I need about licenses to SE-hosted
content. I would like to avoid introducing any ambiguity into the TabFern code
base if at all possible. Thank you for your understanding!

Expand All @@ -29,18 +28,21 @@ base if at all possible. Thank you for your understanding!
found [Think Like a Git](http://think-like-a-git.net/) very helpful.
Remember that whatever you do on your local copy won't mess up anyone
else, so you can relax :) .
1. Install [node.js](https://nodejs.org/). It comes with `npm`.
1. Install [node.js](https://nodejs.org/) v10+.
1. Install [npm](https://docs.npmjs.com/cli/v6) v6+. It comes with node.js on
some systems and is a separate package on others.
1. At a command line, `npm install -g npx`.
1. Fork this repo and clone your fork to your local machine.
* **Update 2021-12-11** The default branch is called `main` (not `master`).

## Developing

We use a [Brunch](https://brunch.io/docs/getting-started)-based workflow. See
below for why. Developing on the `master` branch involves:
below for why. Developing on the `main` branch involves:

1. At a command prompt (`cmd` or `bash`, whichever works), `cd` to the
directory where your fork is.
1. Create a new branch (e.g., `git checkout -b mybranch origin/master`)
1. Create a new branch (e.g., `git checkout -b mybranch origin/main`)
1. Run `npm install`. This will download all the other packages TabFern and
its build process use.
1. Run `npx brunch w`. This will build `app/` and the other directories in the
Expand Down Expand Up @@ -132,3 +134,20 @@ A good example is [this commit](https://github.com/cxw42/TabFern/commit/3ac0f274
`type: checkbox` or `type: text`). See [here](https://github.com/altryne/extensionizr/blob/a6ca3352b1d8b97fa4961209fd050ed7f8bd6e53/ext/src/options_custom/README.md)
for more documentation of the available options.
- Edit the values appropriately.

## Notes about dependencies

The following dev dependencies are listed in `package.json` but **not used**
directly by TF itself. They are listed to increase the minimum required
version satisfying an indirect dependency. If you add such a dependency to
`package.json`, please also add it here.

- acorn
- archiver
- fstream
- lodash
- minimist
- mixin-deep
- path-parse
- set-value
- tar
40 changes: 27 additions & 13 deletions app/settings/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ setting_definitions.push(
`TabFern is by Chris White (<a href="https://devwrench.wordpress.com">blog</a>,
<a href="https://github.com/cxw42/">GitHub</a>). I greatly appreciate
the following contributors! If I have accidentally missed you, please let
me know so I can correct the omission. All names below are in asciibetical
order within each category.`
me know so I can correct the omission. All names below are in case-insensitive
alphabetical order within each category.`
},

{
Expand Down Expand Up @@ -485,7 +485,7 @@ order within each category.`
setting_definitions.push(
{
"tab": future_i18n("What's new?"),
"group": `Version 0.3.0${brplain('2020-xx-xx')}`,
"group": `Version 0.3.0${brplain('2022-xx-xx')}`,
'group_html':true,
"type": "description",
"text": (
Expand All @@ -505,18 +505,32 @@ recovered window will show up in TabFern as a separate, unsaved window
(related to ${issue(41, true)}).</p>
</li>
`) +
`
<li>New option to use Chrome or DuckDuckGo as a favicon source. ${issue(196)}</li>
<li>Show in the tree favicons of pages created by other Chrome extensions. ${issue(202)}</li>
'</ul>'
),

},
{
"tab": future_i18n("What's new?"),
"group": `Version 0.2.2${brplain('2021-12-22')}`,
'group_html':true,
"type": "description",
"text": (
`<h4>Please back up!</h4>
<p>The next version of TabFern will introduce tab-at-a-time ${issue(35)}.
Please back up now (${ham} ${gt} Backup now) just in case of unexpected bugs!
Remember, TabFern carries <b>no warranty</b>.
</p>
<ul>
<li>Fixed a regression in the settings: it is now possible to set the
window action-button order again. ${issue(208)}</li>
window action-button order again. ${issue(208)}</li>
<li>When running a development version of TF, the commit hash will be
listed in the title bar. This will make it easier to reference the
commit in bug reports. ${issue(210)}</li>
<li>Fix broken image links in README.md. Thanks, @bluikko! ${issue(224)}</li>
<li>Misc: ${issue([233, 236, 237], true)}; parts of ${issue(240, true)}.</li>
` +
'</ul>'
listed in the title bar. This will make it easier to reference the
commit in bug reports. ${issue(210)}</li>
<li>Icons of other extensions should now appear in the TF window. ${issue(202)}</li>
<li>Other fixes: ${issue(196,true)}, ${issue(224,true)} (thanks to bluikko),
${issue(233,true)}, ${issue(236,true)}, ${issue(237,true)}</li>
<li>Known issues: ${issue(276,true)}</li>
</ul>`
),

},
Expand Down
Loading

0 comments on commit 10bf616

Please sign in to comment.