23 Commits

Author SHA1 Message Date
Zixaphir
24c45abf25 Release appchan x v2.9.23. 2014-05-03 16:26:12 -07:00
Zixaphir
ea47aefd93 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Settings.html
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadWatcher.coffee
2014-04-11 00:29:52 -07:00
ccd0
1419d5f454 update Gruntfile 2014-04-09 22:42:22 -07:00
Zixaphir
bc501dc022 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/ImageExpand.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-08-15 23:02:54 -07:00
seaweedchan
58d06b4db6 Remove some unwanted changes 2013-08-12 01:21:22 -07:00
Zixaphir
16b35dffce Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Globals.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/General/css/style.css
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-07-21 09:01:27 -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
8560f204b2 Remove userjs support and Presto-related code.
Add `minimum_opera_version` in the manifest.
Up the min Chrome version for unprefixed MutationObserver support.
2013-07-08 19:09:23 +02:00
Zixaphir
3c4d53cdab Start styling the front page again. 2013-06-03 03:47:19 -07:00
Zixaphir
2c2a40c0c9 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
2013-06-01 09:00:56 -07:00
Jordan Bates
561d3a004b Opera 15 wants .nex 2013-05-28 12:58:53 -07:00
Jordan Bates
a30a5927c8 Opera 15 extension 2013-05-28 12:40:42 -07:00
Zixaphir
76c1401c7b hashlink trick. 2013-05-08 07:11:52 -07:00
Zixaphir
f12847ae9c Erp 2013-05-05 15:11:11 -07:00
Zixaphir
443e48d280 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/UI.coffee
2013-05-05 15:10:36 -07:00
Jordan Bates
b7087b249e These mistakes happen too often for me to not put them in .gitignore 2013-04-28 10:45:31 -07:00
Zixaphir
4856a6778d Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	.gitignore
	Gruntfile.js
	src/config.coffee
	src/css/style.css
	src/features.coffee
	src/features/posting/qr.coffee
2013-04-22 01:24:11 -07:00
Nicolas Stepien
9ac1193cca Update .gitignore. 2013-04-17 01:22:11 +02:00
Zixaphir
739220ed11 Expose builds/ because botnets. 2013-04-14 01:03:07 -07:00
Zixaphir
f50c1fcedf Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	4chan_x.user.js
2013-03-18 12:28:52 -07:00
Nicolas Stepien
0a41f0ae6c Make Chrome ext/userscript/userjs builds. 2013-03-18 01:43:50 +01:00
Zixaphir
611377152e Start my quest to integrate 4chan-X V3 2013-03-12 03:53:57 -07:00
Nicolas Stepien
b3d7f30f3a Use Grunt for building from now on. 2012-09-24 22:37:33 +02:00