9 Commits

Author SHA1 Message Date
Zixaphir
8b01a46f30 I have a thing about these kinda things. 2013-08-07 01:54:29 -07:00
Zixaphir
0325539d43 Let's dig. 2013-08-07 00:21:26 -07:00
Zixaphir
cb30242ae8 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/General/Header.coffee
2013-08-05 14:37:23 -07:00
Zixaphir
f41a40c1ad Forgot to add links to the post datatype 2013-08-04 19:47:07 -07:00
Zixaphir
dd4d979276 Still being different for the sake of being difficult 2013-07-24 22:01:48 -07:00
Zixaphir
0ac6747810 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	json/archives.json
	src/General/Main.coffee
2013-07-24 21:55:26 -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
Zixaphir
176913138c Sometimes while loops are better than for loops. 2013-05-07 19:06:53 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00