77 Commits

Author SHA1 Message Date
Zixaphir
1a4871a01e Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Main.coffee
	src/Posting/QuickReply.coffee
2013-08-08 14:57:35 -07:00
Zixaphir
bd1dc8cb53 Fix #298 2013-08-08 14:35:26 -07:00
Zixaphir
254fa9959b And a couple more fixes #136 2013-08-08 14:27:38 -07:00
Zixaphir
ee4ece2574 Fix a few features identifying themselves incorrectly
A few refactors to ColorUserIDs
2013-08-08 14:18:44 -07:00
Zixaphir
4410a8f118 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-06 16:03:07 -07:00
Zixaphir
9b5cb52619 Personal choices 2013-08-06 12:14:23 -07:00
Zixaphir
fe20262e5e Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/Miscellaneous/ExpandThread.coffee
2013-08-06 12:01:16 -07:00
Mayhem
be7a4052fd Close #1106 2013-08-06 16:28:54 +02:00
Mayhem
63cd0aa164 ExpandThread tweaking.
Also fix code trying to $.off `ExpandThread.cb.toggle`.
2013-08-06 15:27:16 +02:00
Zixaphir
a6d05a6115 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-07-24 22:17:35 -07:00
Zixaphir
d01c811fe2 Another indexOf I missed. 2013-07-24 22:06:08 -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
2a99db7cdd src/Miscellaneous/Sauce.coffee -> src/Images/Sauce.coffee 2013-07-02 18:23:12 +02:00
Mayhem
573bd6f294 Fix #1146. 2013-06-29 18:04:23 +02:00
Zixaphir
ebfaaaacc4 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	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/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-06-20 17:21:01 -07:00
seaweedchan
972a8b5261 Indicate Spoilers -> Reveal Spoilers, changelog 2013-06-14 03:37:41 -07:00
seaweedchan
f6d8ee29ae Close #102 2013-06-14 03:30:18 -07:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Daniel
63daa91521 Fix ID coloring style
Add 'border-radius' and 'padding' to IDs with black colored text.
2013-06-13 01:48:54 +03:00
Mayhem
dc2ed6f6f3 Fix captcha support in the report window.
Also shave a line.
2013-06-11 17:34:55 +02:00
Mayhem
336e69c4fe No need to use   to preserve whitespaces anymore. 2013-06-08 20:20:59 +02:00
Mayhem
8251b46778 typo 2013-06-01 20:55:33 +02:00
Mayhem
982ec6ecc6 Remove PSA workaround.
Also this DOMAttrModified actually works.
2013-06-01 17:03:49 +02:00
Mayhem
1752e15da9 Close #1128. 2013-05-31 21:44:06 +02:00
Zixaphir
d038ac9e80 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
2013-05-28 06:46:31 -07:00
Zixaphir
ef1477fb8e remove __indexOf 2013-05-28 06:45:17 -07:00
Zixaphir
a86b1da74f 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
2013-05-28 05:57:21 -07:00
Jordan Bates
33c1d58d5f Merge Mayhem X 2013-05-27 16:14:36 -07:00
Zixaphir
ca4be499a3 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	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/Main.coffee
	src/General/css/style.css
2013-05-27 14:22:31 -07:00
Mayhem
acd2f100c9 Fix #1129. 2013-05-27 20:26:37 +02:00
seaweedchan
2c087f1b8d Dont override arrow keys 2013-05-25 23:17:09 -07:00
Zixaphir
7ef6aa71fd Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	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
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-20 17:06:30 -07:00
Jordan Bates
41a135f1c2 Change view to hide, omitted to expanded, and x Loading... to ... on .summary click. 2013-05-17 04:03:57 -07:00
Zixaphir
70d1d758ec Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	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/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-15 09:00:09 -07:00
Jordan Bates
f4db0a60ff Merge Mayhem X 2013-05-14 13:32:43 -07:00
Zixaphir
1debf61f2e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	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/Header.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/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -07:00
Jordan Bates
e28116ee3e Dont add - Catalog to title, #69
Didn't work very well anyway.
2013-05-13 22:03:11 -07:00
Jordan Bates
c9858fe863 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-13 06:13:36 -07:00
Jordan Bates
7ce69dc091 Fix #75 2013-05-12 21:44:38 -07:00
Mayhem
97da6173f9 Some people add random text instead of real sauce links. 2013-05-12 22:41:23 +02:00
Zixaphir
a61e9e703f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	changelog-old
	json/archives.json
	src/Monitoring/ThreadUpdater.coffee
2013-05-12 07:00:30 -07:00
seaweedchan
de497f1d03 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-11 05:06:23 -07:00
Zixaphir
56518cadd2 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
2013-05-10 23:00:10 -07:00
Zixaphir
0bb1a4db18 Fix Nav.scroll 2013-05-10 22:59:14 -07:00
Zixaphir
e37417481e Workaround for old sauce configurations. 2013-05-10 13:43:58 -07:00
Jordan Bates
4fb8045591 Apparently only the US flag is in troll/. Weird. 2013-05-10 07:25:17 -07:00
Mayhem
aace44479e Fix #1095. 2013-05-10 14:36:27 +02:00
Zixaphir
2a3e0770ce Fix some things broken by removing the Quick Reply option.
close #289, close #291
.__.
2013-05-10 02:48:15 -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