1197 Commits

Author SHA1 Message Date
Jordan Bates
2dffb5d0fb Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-14 19:11:20 -07:00
Zixaphir
9715424f1f Slash or NOTHING 2013-08-14 19:09:51 -07:00
Zixaphir
91ff46718d comment 2013-08-14 18:41:59 -07:00
Jordan Bates
d5326f0d12 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-14 18:37:19 -07:00
Zixaphir
dd2a5bb6e9 Simplify 2013-08-14 18:36:22 -07:00
Jordan Bates
3026299087 Pale Moon support 2013-08-14 18:34:45 -07:00
Zixaphir
34ece16aaa This should match *all* top level domains 2013-08-14 18:32:34 -07:00
Zixaphir
9d1daeaf6e Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-08-14 16:00:56 -07:00
Zixaphir
441f9eac66 Remove the possibility of accidentally matching .jpg with .jp 2013-08-14 15:58:13 -07:00
Zixaphir
521511cd3a Well that was dumb. 2013-08-14 15:43:38 -07:00
Zixaphir
df841c1424 Fix seaweedchan/4chan-x/issues/144 2013-08-14 12:16:55 -07:00
seaweedchan
5a46958ab2 Update changelog 2013-08-14 05:17:43 -07:00
Zixaphir
fd01ec9559 Revert changes to submenu 2013-08-14 05:06:01 -07:00
seaweedchan
2f074e0353 info domain 2013-08-14 03:42:54 -07:00
seaweedchan
a3da2b3cfc Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-14 03:37:45 -07:00
seaweedchan
39d028c888 Add seaweedchan class 2013-08-14 03:35:42 -07:00
Zixaphir
35b2015928 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
2013-08-14 03:34:11 -07:00
Zixaphir
97475d6fac Better leading and trailing character removal. 2013-08-14 03:32:07 -07:00
seaweedchan
40a0fd3d07 Undo watcher class change 2013-08-14 03:31:32 -07:00
seaweedchan
2fcbe0bf30 Merge Zixaphir X 2013-08-14 03:12:10 -07:00
Zixaphir
1f011dfd02 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Header.html
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-14 03:02:03 -07:00
seaweedchan
1b2b859ca2 Whoops 2013-08-14 02:44:17 -07:00
seaweedchan
6b98f8acb4 Make classes consistent with Mayhem X 2013-08-14 02:41:07 -07:00
Zixaphir
42c4937dfb Fix range.endOffset in inline links that end before node.length 2013-08-14 02:02:36 -07:00
Zixaphir
7a08d38d36 Update TDLs 2013-08-14 01:43:09 -07:00
seaweedchan
449cfeeebf Merge PullRequest branch 2013-08-14 00:49:39 -07:00
seaweedchan
756c993ff0 Merge v3 branch 2013-08-14 00:48:58 -07:00
seaweedchan
a6d083b141 .mp and .ly linkifying 2013-08-14 00:45:07 -07:00
seaweedchan
7702a8ce10 Fix typo 2013-08-14 00:38:31 -07:00
seaweedchan
780b740b1a Make first section of linkifier more specific 2013-08-14 00:35:06 -07:00
seaweedchan
46cfd0dfcc US domain name linkifying 2013-08-14 00:03:32 -07:00
seaweedchan
5b326a41ce US domain name linkifying 2013-08-13 23:53:06 -07:00
seaweedchan
2f1fc73ee0 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-13 23:26:44 -07:00
Zixaphir
67636c5b89 Small trim 2013-08-13 20:05:25 -07:00
Zixaphir
b424adb93b Forgot to make regex global 2013-08-13 19:26:43 -07:00
Zixaphir
fb8a856fba Come on, I'm smarter than this 2013-08-13 19:24:13 -07:00
Zixaphir
68e19a0b2e better trim 2013-08-13 19:20:10 -07:00
Jordan Bates
4377e1a93d Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-13 18:57:55 -07:00
Zixaphir
8dc14633eb Better bracket trim, now with comma trim 2013-08-13 18:54:47 -07:00
Jordan Bates
5ce2c53f14 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-13 18:20:00 -07:00
Zixaphir
cc6265a38f Shave off a few things 2013-08-13 18:18:53 -07:00
Zixaphir
cb941ee3fa Bracket removal 2013-08-13 18:16:34 -07:00
Jordan Bates
f345151583 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-08-13 15:37:18 -07:00
Zixaphir
976f539c8c Don't allow indexes larger than start node length 2013-08-13 15:34:39 -07:00
Jordan Bates
368a5ee5c0 Fix #141 2013-08-13 15:20:20 -07:00
Zixaphir
f4e8053783 Prevent jp from matching jpg 2013-08-13 15:20:18 -07:00
Zixaphir
0cc7b8ee29 Couple small changes 2013-08-13 15:12:27 -07:00
Mayhem
b7ddfa5c66 Shave a line and move a few things around in QuoteOP. 2013-08-13 19:10:57 +02:00
Mayhem
46c50baaba Remove some useless code in QuoteCT. 2013-08-13 18:56:10 +02:00
Mayhem
2f13855508 Fixed a typo in QuoteCT which erroneously reported quotelinks inside cross-board clones as cross-thread quotelinks. 2013-08-13 18:53:32 +02:00