12 Commits

Author SHA1 Message Date
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
Zixaphir
093fd54413 Fix $.open
Should fix the issue with opening things in new tabs. Yes, I'm dumb
2013-08-01 10:26:06 -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
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Jordan Bates
902c08f807 Dont let deadlinks get stuck if problems loading 2013-05-20 16:28:02 -07:00
Jordan Bates
d35932ba0f Mayhem X, update changelog 2013-05-20 15:13:06 -07:00
Zixaphir
49585245ea Small flavor change. 2013-05-03 07:14:14 -07:00
Zixaphir
d657c958c1 XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE === 6 2013-05-03 06:53:07 -07:00
Zixaphir
ef3c862543 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx/script.js
2013-04-30 17:24:37 -07:00
Zixaphir
9ba7f2c3f2 Small indexOf optimization. 2013-04-30 17:22:08 -07:00
Jordan Bates
1771bcffde Update nyafuu 2013-04-29 14:03:40 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00