10 Commits

Author SHA1 Message Date
ccd0
e27858216f Remove unwanted execute permissions. 2015-11-15 14:00:17 -08:00
ccd0
5b3ed17296 Merge from Appchan X: src/Filtering
excluded: PostHiding.coffee, ThreadHiding.coffee
2015-01-31 00:49:28 -08:00
ccd0
94928b7c83 Merge from Appchan X: Whitespace and other changes not affecting compiled script. 2015-01-30 01:22:40 -08:00
ccd0
7a2e2d1306 Support Anonymize on internal archive. 2015-01-04 10:15:05 -08:00
ccd0
4fb30a4d8f Support archived thread list page. 2015-01-04 09:47:03 -08:00
Zixaphir
91cedb3b89 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
2013-10-13 13:53:38 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-09-20 05:45:04 -07:00
Jordan Bates
3470929e05 Merge some mayhem changes 2013-09-19 07:27:53 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00