2079 Commits

Author SHA1 Message Date
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
175880a4bd Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-13 15:13:13 -07:00
Zixaphir
0cc7b8ee29 Couple small changes 2013-08-13 15:12:27 -07:00
seaweedchan
f2b15cd0ab Merge Zixaphir X 2013-08-13 05:28:46 -07:00
Zixaphir
2ea8441fd4 Fix a few small issues, new Linkifier regex 2013-08-13 04:26:20 -07:00
seaweedchan
eeb6ee22a4 Remove redundancy 2013-08-13 00:41:04 -07:00
seaweedchan
b8062b0323 Merge Mayhem X 2013-08-13 00:39:05 -07:00
seaweedchan
e75ad405bf Revert class name changes 2013-08-13 00:18:01 -07:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -07:00
Zixaphir
1128608b4b Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
2013-08-12 19:47:16 -07:00
Zixaphir
ade7628838 css classes yo 2013-08-12 19:44:46 -07:00
Zixaphir
6c2c9b281a Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Config.coffee
	src/General/Settings.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-08-12 19:22:37 -07:00
Zixaphir
c71660bf60 Small oversight while merging 2013-08-12 18:55:06 -07:00
Zixaphir
03821c1ac9 Add our toggleable features and such 2013-08-12 18:41:38 -07:00
Zixaphir
e0895c594a Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-08-12 18:26:39 -07:00
Zixaphir
b77864b1da Personal touches 2013-08-12 17:21:01 -07:00
Zixaphir
19e1af9b46 update foolzashit 2013-08-12 17:13:38 -07:00
Zixaphir
86d4fcb07c Lets be a bit smarter about moving the offset 2013-08-12 16:36:05 -07:00
Zixaphir
4a047c39e8 Lets let Link Detection not be influenced by the DOM structure? 2013-08-12 16:05:01 -07:00
seaweedchan
570be575e6 Release 4chan X v1.2.27. 2013-08-12 01:39:20 -07:00
seaweedchan
caf7c67c62 Release 4chan X v1.2.26. 2013-08-12 01:29:44 -07:00
seaweedchan
58d06b4db6 Remove some unwanted changes 2013-08-12 01:21:22 -07:00
Zixaphir
89f1a782a3 zips 2013-08-12 00:39:10 -07:00
Zixaphir
9db6601ae5 Release appchan x v2.3.2. 2013-08-12 00:37:42 -07:00
Zixaphir
758a0e2e56 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-12 00:36:07 -07:00
Zixaphir
22c4fdede5 Range.setEndAfter doesn't work in fragments
But Range.setEnd does?
2013-08-12 00:33:34 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
a8ee9b3992 Oops, accidentally got tired. 2013-08-11 23:44:05 -07:00
Zixaphir
256e20aea5 Since we're adding recursion, we should probably move our variable
declaration outside of the potential recursive function
2013-08-11 23:33:44 -07:00
Zixaphir
045ba42296 Single-handedly one of the most expensive features in 4chan X?
LETS ADD RECURSION!
2013-08-11 23:31:33 -07:00
seaweedchan
def4727bb3 Redo error message
Close #134
2013-08-11 23:30:38 -07:00
Zixaphir
708f56c759 Strengthen Linkifier
Now can linkify within code tags, providing the initial 'check'
is successful.
2013-08-11 23:25:43 -07:00
Zixaphir
3c3606ad92 Release appchan x v2.3.1. 2013-08-11 14:05:16 -07:00
Zixaphir
9759a05c75 Add zips 2013-08-10 14:51:14 -07:00
Zixaphir
73ea806592 Merge branch 'v3'
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/crx/script.js
2013-08-10 14:41:26 -07:00
Zixaphir
6602bb885d Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	package.json
	src/Quotelinks/QuoteYou.coffee
2013-08-10 14:37:45 -07:00
Zixaphir
34e580f475 ~ 2013-08-10 13:54:03 -07:00
Zixaphir
c53b847099 Only Appchan has dropmarkers 2013-08-10 02:06:42 -07:00
Zixaphir
08e7a8a6c4 This will get better when MediaCrush's API improves? 2013-08-10 02:04:41 -07:00
Zixaphir
92ffb4ff8c Why? Because I can. 2013-08-09 22:41:57 -07:00
Zixaphir
a420859a97 Merge branch 'v3' 2013-08-09 21:06:42 -07:00
Zixaphir
e21de118b1 XPath magic is hurd 2013-08-09 21:06:04 -07:00
Zixaphir
70b00a1337 Merge branch 'v3'
Conflicts:
	src/Quotelinks/QuoteYou.coffee
2013-08-09 20:33:42 -07:00
Zixaphir
1470c0e563 More oops 2013-08-09 20:19:08 -07:00
Zixaphir
8a6f3afb8e oops 2013-08-09 19:47:33 -07:00
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
10a2a96a96 Oops 2013-08-09 19:40:21 -07:00
Zixaphir
8b992d42ed Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/$.coffee
	src/Miscellaneous/Time.coffee
2013-08-09 19:36:40 -07:00
Zixaphir
ee291bad0c Force stub menu to work 2013-08-09 19:21:26 -07:00