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

1015 Commits

Author SHA1 Message Date
Zixaphir
ad453f1dee Merge branch 'v3' 
Conflicts:
	builds/4chan-X.user.js
 2013-10-13 14:49:34 -07:00
Zixaphir
d2af181dea I removed autoUpdate 2013-10-13 14:48:43 -07:00
Zixaphir
fe8a49a70e Merge 2013-10-13 14:45:16 -07:00
Zixaphir
4cd72db79c Merge branch 'v3' 2013-10-13 14:44:37 -07:00
Zixaphir
1c9db7536d Restore ThreadUpdater.count() 2013-10-13 14:44:09 -07:00
Zixaphir
904316e4e0 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	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
 2013-10-13 14:42:58 -07:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
 2013-10-13 14:29:52 -07:00
Zixaphir
38010c0b26 A couple of small things 2013-10-13 13:57:36 -07:00
Zixaphir
91cedb3b89 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2013-10-13 13:53:38 -07:00
seaweedchan
26a0c27ac3 Release 4chan X v1.2.41. 2013-10-03 16:49:16 -07:00
seaweedchan
6cab2cfca7 Fix #194 2013-10-03 16:47:45 -07:00
Zixaphir
0935464e05 Just in case 2013-09-24 15:08:38 -07:00
Zixaphir
d2ae42798a Fix seaweedchan/4chan-x#172, fix seaweedchan/4chan-x#190 2013-09-24 15:03:35 -07:00
Zixaphir
7812001d96 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
	src/Posting/QuickReply.coffee
 2013-09-24 14:46:24 -07:00
Zixaphir
5b87c17e69 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/Redirect.coffee
 2013-09-24 14:33:21 -07:00
seaweedchan
c6d5c0c463 Release 4chan X v1.2.40. 2013-09-22 04:45:33 -07:00
seaweedchan
93589e80ef Close #187 2013-09-22 04:40:37 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -07:00
Jordan Bates
37fde17277 Build and changelog 2013-09-21 10:12:25 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
 2013-09-20 05:45:04 -07:00
Zixaphir
8ba58ee12e Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2013-09-20 04:45:46 -07:00
Zixaphir
2915c83e09 Small reflow 2013-09-20 04:42:03 -07:00
Jordan Bates
4ee4856a78 Release 4chan X v1.2.39. 2013-09-19 11:30:50 -07:00
Jordan Bates
2a1368fb80 Fix #185 and #186 2013-09-19 11:28:22 -07:00
Jordan Bates
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Jordan Bates
56387a7162 Fix type and build 2013-09-19 07:30:42 -07:00
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Jordan Bates
85afe58c62 Close #172 2013-09-12 16:37:00 -07:00
Jordan Bates
dde6658610 Close #168 2013-09-12 16:22:07 -07:00
Jordan Bates
ba53df6d22 Close #179 2013-09-12 16:19:43 -07:00
Jordan Bates
0cc8d1aef4 Fix file accidentally renaming, from Mayhem 2013-09-12 16:12:15 -07:00
Zixaphir
0b2fcfc03f Why limit ourselves to two arguments? 2013-09-04 17:33:33 -07:00
Zixaphir
4db1fcd38e Filters 2013-09-04 17:12:13 -07:00
Zixaphir
e4506c43c5 muh gamma curves 2013-09-04 16:52:14 -07:00
Zixaphir
09936f3d6c Adapt silhouette code to generate silhouette Mascots 2013-09-04 15:11:55 -07:00
Zixaphir
98b07e177c One day, I'll just rewrite the whole mascot code 
And then I'll just release it as its own script
And then I'll break Appchan X into script modules
And then, I'll look back
And realize I've come full circle and returned to `ya4cie`
<3 @aeosynth
 2013-09-04 14:27:22 -07:00
Zixaphir
a5471ba547 Merge branch 'v3' 
Conflicts:
	builds/4chan-X.user.js
 2013-09-03 21:42:41 -07:00
Zixaphir
720606d2e2 Trick thread updater into allowing 1 second 
PROTIP: minimum seconds are now techically two, but it'll still
display one. Anyone pissed about this needs to get a life.
 2013-09-03 21:41:00 -07:00
Zixaphir
c7d2021895 Place remove spoilers after Linkify 2013-09-03 17:27:18 -07:00
Zixaphir
aafaadb8eb Fix #448 2013-09-03 16:43:33 -07:00
Zixaphir
aced7b04f8 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
 2013-09-03 16:40:40 -07:00
Zixaphir
6ef4beb3e6 Fix Gallery "fit height" in Chrom* 2013-09-03 16:11:25 -07:00
Zixaphir
ba2ecd8237 Try to fix thread updater. 2013-09-03 15:53:06 -07:00
Zixaphir
ac764fd102 Redo image uploading 
Reduce size before saving, hopefully should reduce issues with
quotas. This will only affect images selected via shift-click.

Also, try to handle 404'd mascots.
 2013-08-31 20:13:41 -07:00
Zixaphir
fa569e5451 Release appchan x v2.3.10. 2013-08-31 10:17:11 -07:00
Zixaphir
8978f461b7 Lets not remove slideout navigation from the DOM if it's hidden 2013-08-31 10:16:11 -07:00
Zixaphir
75c7ef73cd Release appchan x v2.3.9. 2013-08-30 19:35:57 -07:00
Zixaphir
2efd32a0a6 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
 2013-08-30 19:35:10 -07:00
Zixaphir
47bdc73f4c Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	css/style.css
	src/Images/ImageExpand.coffee
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
 2013-08-30 18:15:47 -07:00
Zixaphir
583a140eab Disable, don't remove. Should fix #446, for real this time 
This might actually be more efficient.
 2013-08-30 15:24:41 -07:00