5240 Commits

Author SHA1 Message Date
Zixaphir
5d7df2bd33 Eh, why not? 2013-08-06 17:57:05 -07:00
Zixaphir
275cd3503f oops 2013-08-06 17:44:14 -07:00
Zixaphir
bcdb6193eb Redundancy Reduction Mk. II 2013-08-06 17:41:58 -07:00
Zixaphir
aadfe30b20 Build 2013-08-06 17:18:21 -07:00
Zixaphir
a464939f67 Merge branch 'v3' 2013-08-06 17:17:55 -07:00
Zixaphir
1b89039977 I hate this. 2013-08-06 17:17:34 -07:00
Zixaphir
930b04171b Honestly...
Even if you change the mascot after disabling it, it shouldn't be
a live setting.
2013-08-06 16:55:14 -07:00
Zixaphir
ee0f931cc8 Redundancy reduction 2013-08-06 16:51:19 -07:00
Zixaphir
7a093b26ee Use better practices in my own code. 2013-08-06 16:40:51 -07:00
Zixaphir
4410a8f118 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-06 16:03:07 -07:00
Zixaphir
9159f7adbc I think I'm satisfied with this now. 2013-08-06 14:16:49 -07:00
Zixaphir
5507168019 Forgot to account for hidden posts. 2013-08-06 13:55:44 -07:00
Zixaphir
1227cbd847 Small simplify 2013-08-06 13:37:24 -07:00
Zixaphir
7939d24640 Fix "Advance on contract" option with Quote Threading 2013-08-06 13:33:57 -07:00
Zixaphir
d02ce2ff0f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/General/Header.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadUpdater.coffee
2013-08-06 13:12:41 -07:00
Zixaphir
9b5cb52619 Personal choices 2013-08-06 12:14:23 -07:00
Mayhem
738a175f43 Avoid using {d.body,doc}.scroll{Top,Left}, use window.scroll[...] instead. 2013-08-06 21:11:03 +02: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
9c834f6d76 Merge branch 'v3' 2013-08-05 14:41:13 -07:00
Zixaphir
548bbdd84a Changelog 2013-08-05 14:40:52 -07:00
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
d5553cf5fd TwitchTV embedding (live and archive) 2013-08-05 14:05:29 -07:00
Zixaphir
c44014b19e Lets stop filling syntactical fields with non-meta-data 2013-08-05 13:01:44 -07:00
Zixaphir
250323d304 Vine 2013-08-05 12:19:26 -07:00
Mayhem
6cf7373b93 Fix #1162. 2013-08-05 21:19:20 +02:00
Zixaphir
b67b2d8a4d Follow upstream and remove ".webkit" in favor of ".blink" 2013-08-05 12:01:26 -07:00
Zixaphir
df14b3ffa5 Merge branch 'v3'
Conflicts:
	LICENSE
2013-08-05 00:31:16 -07:00
Zixaphir
d2eef4c4c5 Restore concat:meta 2013-08-05 00:30:32 -07:00
Zixaphir
1fbcbe0507 Merge branch 'v3'
Conflicts:
	builds/crx/script.js
2013-08-05 00:06:48 -07:00
Zixaphir
9eda79c24c Fix Linkify in Chrome
Was skipping every other URL if they were on trailing lines
2013-08-05 00:05:02 -07:00
Zixaphir
724aff27b5 Wow. Just... oops. 2013-08-04 23:50:53 -07:00
Zixaphir
fc8d6c9498 Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Main.coffee
2013-08-04 23:13:55 -07:00
Zixaphir
1640ef5da1 Add cachedTitles to Conf 2013-08-04 23:05:01 -07:00
Zixaphir
217f1cd42c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/Linkification/Linkify.coffee
2013-08-04 20:10:29 -07:00
Zixaphir
37cf68f43d Update changelog 2013-08-04 19:54:56 -07:00
Zixaphir
f41a40c1ad Forgot to add links to the post datatype 2013-08-04 19:47:07 -07:00
Zixaphir
2fa674c782 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	json/archives.json
	src/Archive/Redirect.coffee
	src/General/lib/$.coffee
	src/Monitoring/Unread.coffee
2013-08-04 19:44:42 -07:00
Zixaphir
a54bc6a076 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
2013-08-04 19:02:55 -07:00
Zixaphir
b60ddfe907 I think this is safer. 2013-08-04 18:55:10 -07:00
Zixaphir
a6f6f44d58 Linkifier Rewrite 2013-08-04 18:47:04 -07:00
Zixaphir
4d0ce5da79 Fix #396 2013-08-04 18:33:19 -07:00
Zixaphir
5721510b1c Fallback 2013-08-04 18:27:21 -07:00
Jordan Bates
d0bbe13172 Release 4chan X v1.2.25. 2013-08-04 14:32:25 -07:00
Jordan Bates
ebb2d0bf75 Not sure how no one caught this. 2013-08-04 14:22:26 -07:00
Zixaphir
1e9bab7c8b Accidentally removed checking for title functionality in rewrite 2013-08-04 14:10:07 -07:00
Zixaphir
b0c2d5d344 Accidental extra variable 2013-08-04 14:05:53 -07:00