Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,354 Commits 2 Branches 0 Tags
Commit Graph

35 Commits

Author SHA1 Message Date
Zixaphir
6c2c9b281a Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
	src/General/Config.coffee
	src/General/Settings.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-08-12 19:22:37 -07:00
Zixaphir
e0895c594a Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-08-12 18:26:39 -07:00
Mayhem
e0cb19ac53 $.xhr will now deal with Last-Modified and If-Modified-Since headers itself. 2013-08-11 18:02:22 +02: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
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
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
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
448273441d Small refactor. 2013-05-31 22:19:53 +02: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
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
Jordan Bates
c4aaecc860 @nami-doc doesnt like fatties 2013-05-06 03:14:02 -07:00
Jordan Bates
06900d0a21 Watcher shortcut, #55 2013-05-06 02:35:28 -07:00
Zixaphir
ba5e9c402c Prevent updater race conditions. 2013-05-06 00:27:25 -07:00
Zixaphir
1c7ffc4fcf Merge branch 'v3' into Av2 
Conflicts:
	builds/4chan-X.js
 2013-05-03 14:40:01 -07:00
Zixaphir
057c7af8cc Fix ThreadUpdater timing out due to nodes not existing. 2013-05-03 14:38:37 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2 
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
 2013-05-03 07:17:59 -07:00
Jordan Bates
cea9f7f600 Fix #35 2013-04-29 22:22:52 -07: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
4f779ae64d Merge Mayhem X 2013-04-28 10:37:12 -07:00
Jordan Bates
2880919787 This was unnecessary 2013-04-28 09:00:02 -07:00
Jordan Bates
c82a548e41 Fix #34 2013-04-28 08:56:34 -07:00
Nicolas Stepien
010618a6ef Move some html out the code. 2013-04-27 04:30:31 +02:00
Jordan Bates
e70514b6ec Finish structure 2013-04-26 14:43:01 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00
Nicolas Stepien
a2e87f1200 Structure. 
God damn War Thunder, download faster!
 2013-04-26 17:40:51 +02:00