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

252 Commits

Author SHA1 Message Date
Zixaphir
c526b89c8d Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2013-10-16 14:33:07 -07:00
Zixaphir
6f6766b9a0 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	html/General/Settings-section-Rice.html

Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle
IDColor conflicts between Mayhem's repo and ours
 2013-10-16 13:53:47 -07:00
Zixaphir
9a07882566 Release appchan x v2.4.1. 2013-10-14 00:57:15 -07:00
Zixaphir
5900490e63 Release appchan x v2.4.1. 2013-10-13 17:59:58 -07:00
Zixaphir
add2019705 Release appchan x v2.4.0. 2013-10-13 15:17:25 -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
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
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
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
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
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Jordan Bates
3470929e05 Merge some mayhem changes 2013-09-19 07:27:53 -07:00
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Jordan Bates
0cc8d1aef4 Fix file accidentally renaming, from Mayhem 2013-09-12 16:12:15 -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
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
ba2ecd8237 Try to fix thread updater. 2013-09-03 15:53:06 -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
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
Jordan Bates
bc0f30612c Release 4chan X v1.2.36. 2013-08-26 21:04:35 -07:00
Jordan Bates
d30ed0a8ec For realz fix #164 2013-08-26 20:46:23 -07:00
Zixaphir
ace2f6384f Release appchan x v2.3.8. 2013-08-25 12:59:16 -07:00
Zixaphir
43d010bc8a Release appchan x v2.3.7. 2013-08-25 11:50:04 -07:00
Zixaphir
85f226d3d4 CSS 2013-08-25 10:08:47 -07:00
seaweedchan
6598b5a45e Merge Zixaphir X 2013-08-25 01:15:47 -07:00
seaweedchan
5eb576d5f0 Fix #164 2013-08-24 23:36:07 -07:00
Zixaphir
d4a3bc8a17 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
 2013-08-24 13:57:27 -07:00
Zixaphir
dc0b4d3d41 Keybinds, Werk Tyme, more Mayhem-X-like IDColor 2013-08-24 11:24:49 -07:00
seaweedchan
9a43535675 Some small gallery tweaks 2013-08-23 03:01:13 -07:00
Zixaphir
ccc0335b79 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	css/style.css
	html/Monitoring/ThreadWatcher.html
	json/archives.json
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/img/favicons/empty.gif
	src/Linkification/Linkify.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
 2013-08-22 12:10:33 -07:00
Zixaphir
aabe78984d Shrink Gallery fonts 2013-08-22 10:44:49 -07:00
Zixaphir
a48e80ff5a Release appchan x v2.3.6. 2013-08-21 13:17:52 -07:00
Zixaphir
2f9e7a06d7 Fix mascot and theme saving 2013-08-21 03:14:48 -07:00
Jordan Bates
231e151fbb Release 4chan X v1.2.35. 2013-08-20 15:19:31 -07:00
Mayhem
3f04351e48 Mention Gruber's regexp in the LICENSE. 2013-08-20 17:19:04 +02:00
Zixaphir
7d626b9cb8 Get "slideout" UI working. 2013-08-20 00:20:29 -07:00
Zixaphir
f20b0ac3f7 Release appchan x v2.3.5. 2013-08-19 22:46:34 -07:00
Zixaphir
158390bed1 Fix #436, fix #435 2013-08-19 20:46:14 -07:00
Jordan Bates
0442192181 Release 4chan X v1.2.34. 2013-08-19 07:38:57 -07:00