22 Commits

Author SHA1 Message Date
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -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
cc9e63482a Add devDependency status badge. 2013-06-23 02:03:35 +03:00
Jordan Bates
81d65cc3ca QR doesn't need its own settings section 2013-05-01 02:46:29 -07:00
Jordan Bates
1ccc804c2a Add relevant files 2013-04-24 16:19:28 -07:00
Jordan Bates
a9b5f02626 Update readme 2013-04-24 13:00:52 -07:00
Nicolas Stepien
a599d2af57 Link to the new page. 2013-03-24 03:17:50 +01:00
James Campos
20627c509c readme 2013-03-22 17:48:25 -07:00
Nicolas Stepien
88afacb8ee Extra @match aren't actually necessary when CORS is setup correctly. 2013-02-19 17:06:37 +01:00
Nicolas Stepien
a5f034cc67 change branch for the icon 2012-10-13 17:43:04 +02:00
Nicolas Stepien
4630f3c876 Setup automatic qunit testing. 2012-10-13 17:41:52 +02:00
Nicolas Stepien
d66fb9c322 fixes 2012-09-24 22:47:09 +02:00
Nicolas Stepien
b3d7f30f3a Use Grunt for building from now on. 2012-09-24 22:37:33 +02:00
James Campos
b4261de7e0 README.md -> readme.md 2011-08-10 18:37:51 -07:00
James Campos
f3c5c286cb readme 2011-08-04 09:44:20 -07:00
James Campos
6903d1fe85 branch description 2011-08-04 09:43:29 -07:00
James Campos
adadd4bab3 derp 2011-08-03 12:51:02 -07:00
James Campos
05b31dd817 readme 2011-08-03 12:50:09 -07:00
James Campos
cb8f946287 installing 2011-08-03 10:07:55 -07:00
James Campos
9841d80012 mention cake build 2011-08-03 09:44:28 -07:00
James Campos
3bbf940bbf update readme 2011-05-02 22:01:47 -07:00
James Campos
649afadb25 readme 2011-04-08 02:02:16 -07:00