461 Commits

Author SHA1 Message Date
ccd0
3836813e07 Release 4chan X v1.6.0. 2014-04-06 10:23:24 -07:00
ccd0
31eac580aa implement duckness's upgrade nag disabling option 2014-04-06 10:17:26 -07:00
ccd0
d32b923ac5 work around FF forever-loading bug, other tweaks 2014-04-06 09:58:34 -07:00
ccd0
782fd7ad05 Merge branch 'v3' of https://github.com/zixaphir/appchan-x
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
2014-04-05 18:21:07 -07:00
ccd0
dcda06c40c Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-05 17:36:35 -07:00
ccd0
9245af7a68 Release 4chan X v1.5.2. 2014-04-04 22:18:54 -07:00
Zixaphir
f6353729eb Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee
2014-04-04 20:24:12 -07:00
Zixaphir
4b28626410 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageHover.coffee
	src/Posting/QR.coffee
2014-04-04 16:10:07 -07:00
Zixaphir
db7e039b88 Changelog 2014-04-04 15:50:36 -07:00
ccd0
12feb7dc9b Release 4chan X v1.5.1. 2014-04-04 15:43:53 -07:00
Zixaphir
e4c395a7cd Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
2014-04-04 15:41:15 -07:00
Mayhem
f04f411018 Release 4chan X v3.20.0. 2014-04-05 00:35:50 +02:00
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02:00
ccd0
3e6dfea6ae Release 4chan X v1.5.0. 2014-04-04 13:37:08 -07:00
ccd0
1d6d0518a3 Release 4chan X v1.4.7. 2014-04-03 16:43:10 -07:00
ccd0
1aed06b412 Release 4chan X v1.4.6. 2014-04-03 15:00:41 -07:00
Zixaphir
4756274a73 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Posting/QR.coffee
2014-04-03 14:58:07 -07:00
Zixaphir
46478eb4d0 Merge branch 'duckness' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-03 14:52:55 -07:00
ccd0
1832f124c8 Update archives with data from MayhemYDG fork 2014-04-03 14:52:25 -07:00
ccd0
f6dece4b80 Release 4chan X v1.4.5. 2014-04-03 14:07:56 -07:00
ccd0
7f3d330ba4 Add updater for Chrom* extension. 2014-04-03 14:03:05 -07:00
ccd0
45d3ea8cc8 update CHANGELOG.md 2014-04-03 13:28:30 -07:00
ccd0
6c06100f23 Release 4chan X v1.4.4. 2014-04-03 12:52:24 -07:00
ccd0
798b2bf2e4 Release 4chan X v1.4.3. 2014-04-03 05:11:01 -07:00
ccd0
bf6e918d0d Release 4chan X v1.4.2. 2014-04-02 21:47:46 -07:00
ccd0
58b2c2d4ac Update CHANGELOG.md 2014-04-02 18:55:44 -07:00
Mayhem
fd703d42ba Fix captchas, again. #1531
Conflicts:
	CHANGELOG.md
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-02 17:51:14 -07:00
Zixaphir
8f62341949 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-02 17:12:15 -07:00
Mayhem
a4bd81de54 Release 4chan X v3.19.5. 2014-04-03 01:47:47 +02:00
Mayhem
7bc7aed998 Fix captchas, again. #1531 2014-04-03 01:47:38 +02:00
Zixaphir
cefb710c04 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Header.coffee
2014-03-27 13:50:02 -07:00
Mayhem
c5dfd248e6 Release 4chan X v3.19.4. 2014-03-27 21:31:58 +01:00
Mayhem
825236a002 Fix #1524. 2014-03-27 21:31:16 +01:00
Zixaphir
1afcdd011c Improve Scroll to Post Quoting You logic 2014-03-26 15:31:26 -07:00
Mayhem
2930df7098 Release 4chan X v3.19.3. 2014-03-20 16:33:49 +01:00
Mayhem
c1a7fcd90b Changelog. 2014-03-20 16:33:42 +01:00
Zixaphir
9b9a2980aa Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	README.md
	css/style.css
	html/General/Header.html
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
2014-03-13 14:30:39 -07:00
Mayhem
d649e5e21e Release 4chan X v3.19.2. 2014-03-12 11:42:35 +01:00
Mayhem
fd942b345b Changelog. 2014-03-12 11:42:29 +01:00
Mayhem
84a53c5d41 Release 4chan X v3.19.1. 2014-03-10 09:32:15 +01:00
Mayhem
3b183d7283 Nuke toggling the header auto-hide by clicking on its border. 2014-03-10 09:29:30 +01:00
Zixaphir
9ba951ca48 Changelog 2014-03-06 21:27:55 -07:00
Zixaphir
5a1bebf14d Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Posting/QR.coffee
2014-03-01 14:53:36 -07:00
Kabir Sala
3362e3a436 Release 4chan X v1.4.1. 2014-03-01 18:53:03 +01:00
Zixaphir
292299d43c Merges are not noteworthy 2014-02-28 20:03:06 -07:00
Zixaphir
553a5a9133 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/Posting/QR.coffee
2014-02-28 19:37:26 -07:00
Kabir Sala
180844b376 Merge 2014-02-24 23:35:11 +01:00
Kabir Sala
4adbe5a8d9 Release 1.4.0 2014-02-24 22:56:18 +01:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
2014-02-23 14:04:45 -07:00
Zixaphir
6884039627 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Posting/QR.coffee
2014-02-23 08:49:32 -07:00