37 Commits

Author SHA1 Message Date
Zixaphir
4410a8f118 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-06 16:03:07 -07:00
Zixaphir
9159f7adbc I think I'm satisfied with this now. 2013-08-06 14:16:49 -07:00
Zixaphir
5507168019 Forgot to account for hidden posts. 2013-08-06 13:55:44 -07:00
Zixaphir
1227cbd847 Small simplify 2013-08-06 13:37:24 -07:00
Zixaphir
7939d24640 Fix "Advance on contract" option with Quote Threading 2013-08-06 13:33:57 -07:00
Zixaphir
d02ce2ff0f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/General/Header.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadUpdater.coffee
2013-08-06 13:12:41 -07:00
Mayhem
738a175f43 Avoid using {d.body,doc}.scroll{Top,Left}, use window.scroll[...] instead. 2013-08-06 21:11:03 +02:00
Zixaphir
217f1cd42c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/Linkification/Linkify.coffee
2013-08-04 20:10:29 -07:00
Zixaphir
a54bc6a076 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2013-08-04 19:02:55 -07:00
Jordan Bates
ebb2d0bf75 Not sure how no one caught this. 2013-08-04 14:22:26 -07:00
Zixaphir
16b35dffce Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Globals.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/General/css/style.css
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-07-21 09:01:27 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
Mayhem
33d3518e76 "id" -> "ID" in dataset suffixes. 2013-07-14 19:03:22 +02:00
Mayhem
ddbec61e1b Use dataset setters instead of setAttribute. 2013-07-14 18:51:02 +02:00
Mayhem
d93a4ebf4b Shave two lines in Sauce.coffee. 2013-07-08 19:10:58 +02:00
Mayhem
8560f204b2 Remove userjs support and Presto-related code.
Add `minimum_opera_version` in the manifest.
Up the min Chrome version for unprefixed MutationObserver support.
2013-07-08 19:09:23 +02:00
Mayhem
2a99db7cdd src/Miscellaneous/Sauce.coffee -> src/Images/Sauce.coffee 2013-07-02 18:23:12 +02:00
Zixaphir
bddfa28665 close #365
vh yo
2013-06-20 19:48:12 -07:00
Zixaphir
ca4be499a3 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
2013-05-27 14:22:31 -07:00
Jordan Bates
4481b56851 Mayhem X 2013-05-27 06:13:40 -07:00
seaweedchan
646f668c58 Change order value 2013-05-25 23:39:50 -07:00
Zixaphir
81bd621d0d Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Settings/Advanced.html
2013-05-23 15:51:51 -07:00
Zixaphir
139e2f9768 hue hue hue hue
(image prefetching)
2013-05-23 13:09:11 -07:00
Zixaphir
cdade63440 Advance on contract 2013-05-21 18:40:27 -07:00
Mayhem
b5caa77df8 Use vh for image expansion's "Fit height" on Chrome and Firefox.
Should give much better performance when resizing for example.
2013-05-21 21:08:22 +02:00
Zixaphir
7ef6aa71fd Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-20 17:06:30 -07:00
Jordan Bates
ffcb072e5c Dont apply advance on contract if fappe tyme, temporarily 2013-05-20 14:45:03 -07:00
Jordan Bates
75735aedf0 Advance on contract option, close #74 2013-05-19 21:24:21 -07:00
Zixaphir
1debf61f2e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -07:00
Zixaphir
36e11ff921 Fix file redirection.
This was all my bad.
2013-05-12 15:34:29 -07:00
Zixaphir
249a739bfc Add @MayhemYDG's archive redirection 2013-05-12 09:00:00 -07:00
Zixaphir
5b84565c80 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
2013-05-08 06:24:19 -07:00
Zixaphir
4d365b825d Fix FappeTyme always enabled. 2013-05-08 06:06:57 -07:00
Mayhem
538e117746 Add archive selection. 2013-05-06 06:57:29 +02:00
Zixaphir
77433f5da8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07:00
Jordan Bates
628898fd74 Imaging -> Images 2013-04-26 14:23:00 -07:00
Nicolas Stepien
a2e87f1200 Structure.
God damn War Thunder, download faster!
2013-04-26 17:40:51 +02:00