16 Commits

Author SHA1 Message Date
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
8b01a46f30 I have a thing about these kinda things. 2013-08-07 01:54:29 -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
Mayhem
6cf7373b93 Fix #1162. 2013-08-05 21:19:20 +02: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
8854f9a06f Fix flag building. 2013-07-02 18:50:46 +02:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Mayhem
e9f3b512b5 Fix #1144. 2013-06-07 14:01:41 +02:00
Jordan Bates
4481b56851 Mayhem X 2013-05-27 06:13:40 -07:00
Mayhem
a2ac3d73e1 Fix building of deleted files. 2013-05-21 18:37:13 +02:00
Jordan Bates
4fb8045591 Apparently only the US flag is in troll/. Weird. 2013-05-10 07:25:17 -07:00
Jordan Bates
9c84cd379c Fix flags on /pol/, zixaphir/appchan-x#292 2013-05-10 01:04:46 -07:00
Jordan Bates
875bc98d0f Catch up to Mayhem, without archive changes 2013-05-09 19:33:33 -07:00
Mayhem
24a78353f6 Update post builder.
Let's say this does fix #954.
2013-05-09 20:32:50 +02: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