76 Commits

Author SHA1 Message Date
Zixaphir
a464939f67 Merge branch 'v3' 2013-08-06 17:17:55 -07:00
Zixaphir
1b89039977 I hate this. 2013-08-06 17:17:34 -07:00
Zixaphir
4410a8f118 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-06 16:03:07 -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
2fa674c782 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	json/archives.json
	src/Archive/Redirect.coffee
	src/General/lib/$.coffee
	src/Monitoring/Unread.coffee
2013-08-04 19:44:42 -07:00
Mayhem
b83e536c86 Don't save the unread count if the thread is dead. 2013-08-01 20:41:23 +02: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
39aa9d3cb5 Merge pull request #1183 from MayhemYDG/opera
Drop Opera <15 support.
2013-07-09 01:56:58 -07:00
Mayhem
7d38f0502c More thoughtful unread-scroll code. 2013-07-08 23:54:44 +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
fa50087323 Never unread-scroll to OPs.
Also fix a dumb loop assignment.
2013-07-05 23:18:04 +02:00
Zixaphir
ebfaaaacc4 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
	src/Posting/QuickReply.coffee
2013-06-20 17:21:01 -07:00
Jordan Bates
7b466831d9 Undo Mayhem's updater changes to avoid issues, close #104 2013-06-14 07:29:58 -07:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Mayhem
0f742f0d0b Show "Dead" instead of the page number when the thread 404s. 2013-06-11 17:03:13 +02:00
Zixaphir
191aec36ad Rethink Emoji. 2013-06-06 07:19:46 -07:00
Zixaphir
50cd57d92e Fix slideout thread watcher alignment 2013-06-02 13:55:10 -07:00
Zixaphir
697078b084 I like this character better. 2013-06-01 17:12:20 -07:00
Mayhem
448273441d Small refactor. 2013-05-31 22:19:53 +02:00
Mayhem
90e40e11e7 Fix #1131. 2013-05-31 21:20:16 +02: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
Jordan Bates
55def8c027 Page Count in Stats option, #43 2013-05-27 00:25:56 -07:00
Mayhem
121bd1834c Add page number in Thread Stats. Close #832 2013-05-26 01:06:01 +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
d35932ba0f Mayhem X, update changelog 2013-05-20 15:13:06 -07:00
Mayhem
388c8b9d1a Fix withCredentials on synchronous XHRs. 2013-05-20 02:46:34 +02:00
Zixaphir
70d1d758ec 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
	src/Posting/QuickReply.coffee
2013-05-15 09:00:09 -07:00
Jordan Bates
68678e671a Revert Mayhem's unread scrolling changes
Too buggy. Threads often don't scroll at all.
2013-05-15 02:43:35 -07:00
Zixaphir
4b8b9ad493 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	src/General/Settings.coffee
2013-05-14 13:15:39 -07:00
Zixaphir
722e2ebb5d Quoted Title 2013-05-14 12:53:33 -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
Jordan Bates
4b0b8df894 Change watcher icon to heart 2013-05-14 07:46:25 -07:00
seaweedchan
c158e0475a Fix #71 2013-05-11 04:58:24 -07:00
seaweedchan
f0f1fdb0b5 Give in and add fixed thread watcher option 2013-05-11 04:31:02 -07:00
Zixaphir
e506bb5a5c Merge branch 'v3' 2013-05-10 15:56:57 -07:00
Zixaphir
17755b435b And this is why you should do you bugtesting on the source
Not the compiled output.
2013-05-10 15:56:14 -07:00
Zixaphir
61b2381d15 Merge branch 'v3' 2013-05-10 14:36:12 -07:00
Zixaphir
2ced33b8e2 Found it. 2013-05-10 14:35:57 -07:00
Zixaphir
fd54b161f5 Fix "Updater and Thread Stats in Header" option. 2013-05-10 13:04:54 -07:00
Jordan Bates
4fb8045591 Apparently only the US flag is in troll/. Weird. 2013-05-10 07:25:17 -07:00
Mayhem
aace44479e Fix #1095. 2013-05-10 14:36:27 +02:00
Zixaphir
9ce09d216e 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
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Posting/QuickReply.coffee
2013-05-10 02:41:08 -07:00
Jordan Bates
875bc98d0f Catch up to Mayhem, without archive changes 2013-05-09 19:33:33 -07:00
Jordan Bates
015bc15641 Close #60 2013-05-07 20:28:34 -07:00
Zixaphir
86f9536406 Remove thread watcher toggle 2013-05-07 19:22:10 -07:00
Zixaphir
93b94ec9d0 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/version
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
2013-05-06 16:54:39 -07:00