21 Commits

Author SHA1 Message Date
Zixaphir
00675c32bc Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/Quotelinks/QuoteYou.coffee
2013-08-09 19:45:24 -07:00
Zixaphir
ee291bad0c Force stub menu to work 2013-08-09 19:21:26 -07:00
Zixaphir
22f4dd698a Force stub menu to work 2013-08-09 18:52:49 -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
33d3518e76 "id" -> "ID" in dataset suffixes. 2013-07-14 19:03:22 +02:00
Mayhem
ddbec61e1b Use dataset setters instead of setAttribute. 2013-07-14 18:51:02 +02:00
Zixaphir
a273828c75 fourchanx-link -> brackets-wrap 2013-05-10 02:55:46 -07:00
Zixaphir
9ce09d216e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Posting/QuickReply.coffee
2013-05-10 02:41:08 -07:00
Jordan Bates
4e7846a7de Add all brackets as .fourchanx-link pseudo-elements, close #67 2013-05-09 23:53:41 -07:00
Jordan Bates
3a9160d090 Merge Zixaphir X 2013-05-09 01:53:44 -07:00
Zixaphir
b1df7430cf Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
2013-05-09 01:19:45 -07:00
Zixaphir
afb1001cbb Fix stubs menu not following stubs config (firefox only?) 2013-05-09 01:17:22 -07:00
Jordan Bates
7ea2e633ff Hide stub link 2013-05-08 23:15:47 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
2013-05-03 07:17:59 -07:00
Jordan Bates
81d65cc3ca QR doesn't need its own settings section 2013-05-01 02:46:29 -07:00
Mayhem
363753fc19 Navigate to stubbed threads. #1074 2013-04-30 19:32:12 +02:00
Mayhem
a77f572c28 Remove that old tmp fix. 2013-04-30 19:04:37 +02:00
Zixaphir
77433f5da8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07: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