82 Commits

Author SHA1 Message Date
Zixaphir
ae9b197d3f Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Settings.coffee
2013-08-05 14:38:52 -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
b36cf54d83 Make use of a few CoffeeScript filters. 2013-08-05 23:30:39 +02:00
Zixaphir
5b102edb18 Merge branch 'v3' 2013-07-31 17:40:56 -07:00
Zixaphir
4317526923 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	.gitattributes
	src/Posting/QuickReply.coffee
2013-07-31 17:39:46 -07:00
Mayhem
6ee8dc83a7 Fix #1210
We were inserting the same Post twice in QR.posts,
once in the constructor, and once in the splice.
2013-07-30 15:13:33 +02:00
Zixaphir
abb3b0e5b4 Disable Quote Threading by default 2013-07-27 03:58:19 -07:00
Zixaphir
cbb720dd22 Change that error message. 2013-07-24 22:31:22 -07: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
44a2b378ca Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Posting/QuickReply.coffee
2013-07-24 21:49:24 -07:00
Matt Wilmink
aba70b9f15 Fix #118 2013-07-23 22:46:20 -04:00
Jordan Bates
07cb9074e0 Better error message
Close #96
2013-07-22 08:52:18 -07:00
Jordan Bates
c9ec6b5497 Fix #113 2013-07-22 08:38:49 -07:00
Jordan Bates
3e35ced05e Fix captcha caching across threads 2013-07-22 07:52:02 -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
8a9df9d15a Tiny optimization to avoid calling QR.status() multiple times when closing the QR. 2013-07-20 18:19:51 +02:00
Mayhem
dc8551bcf1 Fix #1194. 2013-07-20 18:08:53 +02:00
Mayhem
56d44bc310 Fix #1189. 2013-07-20 13:23:59 +02:00
Mayhem
d1f3aa78b8 instanceof Event works fine now in GM 2013-07-15 11:47:10 +02:00
Mayhem
a501bd70af Fix #1184. 2013-07-09 21:35:33 +02: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
Mayhem
b3d38cbabd contextFromLink -> contextFromNode 2013-07-02 18:21:05 +02:00
Mayhem
97087af42f Simpler QR quoting code. 2013-07-02 15:19:15 +02:00
Mayhem
1e592dc24f Fix the URL var not being actually used. 2013-06-22 18:32:24 +02:00
Zixaphir
283a33c443 A lot of backpedaling here. 2013-06-20 19:20:32 -07: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
Zixaphir
2c7900442c Oh lawd, is that a commit? 2013-06-20 17:09:20 -07:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Mayhem
d8f08ce07e Fix #1154. 2013-06-11 20:52:35 +02:00
Zixaphir
97b3069af1 close #349 2013-06-04 10:48:13 -07:00
Mayhem
eeb5d974dd v3 doesn't support browsers with prefixed MutationObservers. 2013-06-04 16:41:22 +02:00
Zixaphir
af48ff03ea Ensure mascot element is passed around correctly 2013-06-03 13:36:40 -07:00
Zixaphir
dcac62d45e Rethink mascots (again) 2013-06-03 10:03:47 -07:00
Zixaphir
697078b084 I like this character better. 2013-06-01 17:12:20 -07:00
Zixaphir
271aeb9bf7 Yeah, this will probably break a lot... 2013-05-31 16:55:30 -07:00
Zixaphir
918d364fc1 Close #285 2013-05-28 16:43:46 -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
Jordan Bates
4481b56851 Mayhem X 2013-05-27 06:13:40 -07:00
Mayhem
e9b4c133ac Fix #1124. 2013-05-25 22:24:10 +02:00
seaweedchan
d9cad02d72 Fix #86 2013-05-24 23:40:50 -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
9462910961 Dont really need a title 2013-05-20 01:07:45 -07:00
Jordan Bates
f4059e723d QR link fixes 2013-05-20 01:05:49 -07:00
seaweedchan
ab8977fb6e Restrict click event to link 2013-05-18 03:43:43 -07:00
Mayhem
be934756d4 Close #856. 2013-05-17 23:13:46 +02:00
Jordan Bates
2f9304840d Higher default cooldown on /q/, thanks moot 2013-05-17 04:41:18 -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
f91702b984 Option affects lack of captcha warning as well 2013-05-15 06:11:01 -07:00
Jordan Bates
51dee38f95 Redundancy 2013-05-15 03:41:57 -07:00