Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,587 Commits 2 Branches 0 Tags
Commit Graph

1973 Commits

Author SHA1 Message Date
Zixaphir
13236e18d3 Merge branch 'master' of github.com:zixaphir/appchan-x 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-27 12:39:51 -07:00
Zixaphir
2efa358131 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/CatalogLinks.coffee
	src/Posting/QR.coffee
 2014-05-27 12:39:01 -07:00
Zixaphir
05de96fd0b Try again on zixaphir/appchan-x#724 2014-05-16 09:25:51 -07:00
Zixaphir
a0f5efdcc7 Attempt to resolve zixaphir/appchan-x#724 2014-05-16 09:21:15 -07:00
Zixaphir
d08ccf7ddb Slight reflow 
I doubt we'll ever have a video in a 404'd tab. srsly.
 2014-05-16 09:17:23 -07:00
Zixaphir
39b0587ddf Fix zixaphir/appchan-x#725 2014-05-16 09:14:44 -07:00
Zixaphir
359a503bd0 Fix zixaphir/appchan-x#668 2014-05-16 09:04:36 -07:00
Zixaphir
c5d686ceb0 Refresh stale board index on tab/window focus 2014-05-16 08:53:17 -07:00
Zixaphir
4f820ad8de 4gropes has been broken for awhile, I guess? Fix #687 
If anyone has a new catalog to replace 4gropes, CC me.
 2014-05-11 19:42:13 -07:00
Zixaphir
741081fc27 Unnecessary. 2014-05-11 17:54:49 -07:00
Zixaphir
1d13bffa7c This should fix any problems caused by the checkDimensions refactor 2014-05-11 17:52:47 -07:00
Zixaphir
8cf9ad236a I thought I fixed that already? OH WELL 2014-05-11 16:28:56 -07:00
Zixaphir
d238bcc20f Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Build.coffee
 2014-05-11 16:08:51 -07:00
Zixaphir
37a3b05e39 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	package.json
	src/Archive/archives.json
	src/General/Get.coffee
	src/General/Navigate.coffee
	src/Images/Gallery.coffee
	src/Linkification/Linkify.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
 2014-05-11 16:04:14 -07:00
Zixaphir
cb3d64cae9 Revert "Escape potentially malicious fields." 
This reverts commit 3f69b4d791a219d1d5a71c7abfeaa4390145756b.

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-11 15:31:17 -07:00
ccd0
8440050ee4 Release 4chan X v1.7.33. 2014-05-10 23:22:40 -07:00
ccd0
368baebfc1 Release 4chan X v1.7.32. 2014-05-10 01:09:14 -07:00
Brandon
de2d6a0303 /f/ security issue #722 2014-05-09 10:53:56 -07:00
ccd0
8d153b8ac4 Release 4chan X v1.7.31. 2014-05-08 02:45:49 -07:00
Zixaphir
938acfe5d8 Release appchan x v2.9.26. 2014-05-07 23:25:13 -07:00
Zixaphir
3f69b4d791 Escape potentially malicious fields. 
I don't think the comment or email fields will be an issue.
 2014-05-07 23:18:47 -07:00
ccd0
f02f40dfef Release 4chan X v1.7.30. 2014-05-05 20:29:04 -07:00
Zixaphir
fd2992c831 Release appchan x v2.9.25. 2014-05-05 19:36:50 -07:00
Zixaphir
bc0580286b Merge branch 'master' of github.com:zixaphir/appchan-x 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-05 19:34:14 -07:00
Brandon
5281d23218 Not you again... 2014-05-05 15:39:50 -07:00
Brandon
ae997753e2 fix #720 2014-05-04 16:13:40 -07:00
Zixaphir
037a134361 Release appchan x v2.9.24. 2014-05-04 05:08:15 -07:00
Zixaphir
0f5365263d Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-03 16:48:36 -07:00
Zixaphir
f4af72de79 Fix image prefetching 2014-05-03 16:42:01 -07:00
Zixaphir
24c45abf25 Release appchan x v2.9.23. 2014-05-03 16:26:12 -07:00
Zixaphir
1238893eae Fix updating of theming content requiring text input on change. 2014-05-03 16:11:52 -07:00
Zixaphir
93c5ecae9c Merge branch 'v3' 2014-05-03 16:07:23 -07:00
Zixaphir
0faacd737e Revert "Lets pretend we're smarter than we really are!" 
This reverts commit 393eb3ec2289293dd4d4caaef17db33bb695fa30.

Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-05-03 16:05:46 -07:00
Brandon
e4efa68044 fix #714 2014-05-03 16:04:29 -07:00
Brandon
f969d7e21a fix #714 2014-05-03 12:46:16 -07:00
ccd0
670c498a11 Release 4chan X v1.7.29. 2014-05-03 10:39:33 -07:00
ccd0
c3e25ef3ab Release 4chan X v1.7.28. 2014-05-03 08:32:07 -07:00
Zixaphir
2b2b032f1b Release appchan x v2.9.22. 2014-05-03 07:10:47 -07:00
Zixaphir
1229786aa5 Merge branch 'v3' 2014-05-03 07:09:44 -07:00
Zixaphir
541882103a Fix backlinks 2014-05-03 07:05:28 -07:00
Zixaphir
af9ea192de Release appchan x v2.9.21. 2014-05-03 06:48:02 -07:00
Zixaphir
3254a1d232 This is causing more issues than it's preventing. 2014-05-03 06:44:01 -07:00
Zixaphir
7514ff41d4 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
 2014-05-03 06:39:09 -07:00
Zixaphir
fd76d85c07 Invalid string 2014-05-03 06:37:49 -07:00
Zixaphir
9d3ad61925 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-03 06:29:56 -07:00
Zixaphir
7375484693 Some misses 2014-05-03 06:27:49 -07:00
Zixaphir
c04c83f915 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Theming/Banner.coffee
 2014-05-03 06:20:04 -07:00
Zixaphir
e8a3f65c5f Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2014-05-03 06:09:14 -07:00
Zixaphir
0fdeae4e77 Consolidate dimension-check code into QR.post. 
Reduces redundant generation of video/image elements for thumbnail
generation and dimension check code by merging them into one routine
 2014-05-03 06:05:28 -07:00
Zixaphir
7f01817977 Missed one 2014-05-03 03:37:04 -07:00