Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable' into bbeta

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2015-01-26 23:22:24 -08:00
commit c1a1710f81
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -14,6 +14,11 @@ Based on v1.9.20.8.
- Minor bugfixes. - Minor bugfixes.
<!-- v1.9.20.x --> <!-- v1.9.20.x -->
### v1.9.20.9
*2015-01-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.9/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix description of Thread Updater options in settings panel.
### v1.9.20.8 ### v1.9.20.8
*2015-01-24* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.8/builds/4chan-X-noupdate.crx "Chromium version")] *2015-01-24* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.20.8/builds/4chan-X-noupdate.crx "Chromium version")]

2
src/General/Config.coffee
View File

@ -288,7 +288,7 @@ Config =
'Monitoring': 'Monitoring':
'Thread Updater': [ 'Thread Updater': [
true true
'Fetch and insert new replies. Has more options in its own dialog.' 'Fetch and insert new replies. Has more options in the header menu and the "Advanced" tab.'
] ]
'Unread Count': [ 'Unread Count': [
true true