minor
This commit is contained in:
Mr. Stallion
parent
fb5cec06ba
commit
cf1238fff6
|
|
@ -5,6 +5,12 @@
|
|||
* Post Ads and Ad Editor have been merged together into My Ads
|
||||
* Profile Helper now only shows up if you have anything to fix; otherwise the profile helper can be found in the Settings menu
|
||||
|
||||
## 1.25.0
|
||||
* Fixed broken adblocker
|
||||
* Fixed incorrect BBCode rendering of `[collapse=[hr]test[hr]]` (Credit: [@Abeehiltz](https://github.com/Abeehiltz))
|
||||
* Added option for switching browsers (Credit: [@greyhoof](https://github.com/greyhoof))
|
||||
* Switched `node-sass` to `sass` for ARM64 compatibility (Credit: [@WhiteHusky](https://github.com/WhiteHusky))
|
||||
|
||||
## 1.24.2
|
||||
* Hotfix to address connectivity issues
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
# Contributors
|
||||
|
||||
> Want to contribute? Please [continue here](https://github.com/hearmeneigh/fchat-rising/wiki/Contributions).
|
||||
|
||||
This project contains contributions from:
|
||||
|
||||
* [Mr Stallion, esq.](https://github.com/hearmeneigh)
|
||||
* [twilight-sparkle-irl](https://github.com/twilight-sparkle-irl)
|
||||
* [ButterCheezii](https://github.com/ButterCheezii)
|
||||
* [FatCatClient](https://github.com/FatCatClient)
|
||||
* [WhiteHusky](https://github.com/WhiteHusky)
|
||||
* [Abeehiltz](https://github.com/Abeehiltz)
|
||||
* [greyhoof](https://github.com/greyhoof)
|
||||
* [F-List Team](https://github.com/f-list) (original F-Chat 3.0 client)
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ Current log location: {1}`,
|
|||
'settings.beta': 'Opt-in to test unstable prerelease updates',
|
||||
'settings.hwAcceleration': 'Enable hardware acceleration (requires restart)',
|
||||
'settings.bbCodeBar': 'Show BBCode formatting bar',
|
||||
'settings.browserOption': 'Set command for opening clicked links',
|
||||
'settings.browserOption': 'Set default browser',
|
||||
'settings.browserOptionHeader': 'Browser Settings',
|
||||
'settings.browserOptionTitle': 'Browser Path',
|
||||
'settings.browserOptionPath': 'Path to browser executable',
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@
|
|||
<div>This is an advanced setting. By changing this setting to an unsupported program (i.e. not a browser), you might not be able to open links from F-Chat anymore.</div>
|
||||
|
||||
<div v-if="isMac"><hr/>
|
||||
<p>Mac User: As of writing, MacOS has a bug in how it handles opening links.</p>
|
||||
<p>When your default browser is something other than Safari and you select Safari in this settings window, links might be opened twice.</p>
|
||||
<p>Once in Safari and a second time in your default browser. This tends to happen when Safari is not running when clicking a link.</p></div>
|
||||
<p>Mac User: As of writing, MacOS has a bug in how it handles opening links.</p>
|
||||
<p>When your default browser is something other than Safari and you select Safari in this settings window, links might be opened twice.</p>
|
||||
<p>Once in Safari and a second time in your default browser. This tends to happen when Safari is not running when clicking a link.</p></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -57,13 +57,13 @@
|
|||
</div>
|
||||
<div class="form-group col-12">
|
||||
<div class="row no-gutters">
|
||||
<div class="col-2">
|
||||
<button class="btn btn-primary" @click.prevent.stop="submit()">{{l('settings.browserOptionSave')}}</button>
|
||||
</div>
|
||||
<div class="col"></div>
|
||||
<div class="col-4">
|
||||
<button class="btn btn-danger" style="float: right;" @click.prevent.stop="resetToDefault()">{{l('settings.browserOptionReset')}}</button>
|
||||
</div>
|
||||
<div class="col"></div>
|
||||
<div class="col-2">
|
||||
<button class="btn btn-primary" @click.prevent.stop="submit()">{{l('settings.browserOptionSave')}}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ export class BlockerIntegration {
|
|||
protected static readonly adBlockerLists = [
|
||||
'https://easylist.to/easylist/easylist.txt',
|
||||
'https://easylist.to/easylist/easyprivacy.txt', // EasyPrivacy
|
||||
'https://easylist-downloads.adblockplus.org/easylist-cookie.txt', // Easy Cookies
|
||||
'https://secure.fanboy.co.nz/fanboy-cookiemonster.txt', // Easy Cookies
|
||||
'https://easylist.to/easylist/fanboy-social.txt', // Fanboy Social
|
||||
'https://easylist.to/easylist/fanboy-annoyance.txt', // Fanboy Annoyances
|
||||
'https://filters.adtidy.org/extension/chromium/filters/2.txt', // AdGuard Base
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
"webpack": "5.8.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@cliqz/adblocker-electron": "1.23.9",
|
||||
"@cliqz/adblocker-electron": "^1.26.12",
|
||||
"jquery": "^3.6.0",
|
||||
"node-fetch": "2.6.11"
|
||||
},
|
||||
|
|
@ -73,11 +73,7 @@
|
|||
"vue-loader": "15.9.8",
|
||||
"vue-template-compiler": "2.6.12",
|
||||
"@types/bluebird": "3.5.32",
|
||||
"@types/node": "16.18.32",
|
||||
"@cliqz/adblocker": "1.23.9",
|
||||
"@cliqz/adblocker-content": "1.23.9",
|
||||
"@cliqz/adblocker-electron-preload": "1.23.9",
|
||||
"@cliqz/adblocker-extended-selectors": "1.23.9"
|
||||
"@types/node": "16.18.32"
|
||||
},
|
||||
"scripts": {
|
||||
"__removed__postinstall": "electron-rebuild --prebuild-tag-prefix=ignoreprebuilds -f -o keytar",
|
||||
|
|
|
|||
Loading…
Reference in New Issue