2814 Commits

Author SHA1 Message Date
Zixaphir
6d9b9cef8f Fix #470
I swear I fixed this... already?
2013-10-14 08:29:29 -07:00
Zixaphir
2a571fdecf Fix issues with header bar and sidebar width 2013-10-13 15:02:03 -07:00
Zixaphir
5d7026d550 Fix Asuka_Langley_Soryu_3 mascot 2013-10-13 14:53:06 -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
Mayhem
10e93091d7 {Post,Thread}::callbacks => {Post,Thread}.callbacks 2013-10-02 11:38:15 +02: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
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -07:00
seaweedchan
7c9d54792a Update Build.coffee
#190
2013-09-21 00:09:32 -07:00
seaweedchan
a274214c07 Update post.html 2013-09-21 00:05:49 -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
Jordan Bates
2a1368fb80 Fix #185 and #186 2013-09-19 11:28:22 -07:00
Jordan Bates
3470929e05 Merge some mayhem changes 2013-09-19 07:27:53 -07:00
Mayhem
5ae957b0e2 Remove capcode replies-related code as it's not relevant anymore. 2013-09-19 11:53:11 +02:00
Mayhem
dcae343687 Remove some sage-related code that is not relevant anymore. 2013-09-19 11:43:50 +02:00
Jordan Bates
85afe58c62 Close #172 2013-09-12 16:37:00 -07:00
Jordan Bates
ba53df6d22 Close #179 2013-09-12 16:19:43 -07:00
Zixaphir
4db1fcd38e Filters 2013-09-04 17:12:13 -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
c7d2021895 Place remove spoilers after Linkify 2013-09-03 17:27:18 -07:00
Zixaphir
6ef4beb3e6 Fix Gallery "fit height" in Chrom* 2013-09-03 16:11:25 -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
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
Mayhem
0e3222312c Remove a Chrome bug notice as it didn't seem to actually work. 2013-08-29 16:18:52 +02:00
Mayhem
44bde8781f Drop support for prefixed flexbox. 2013-08-27 12:53:41 +02:00
Jordan Bates
a62323915d Gallery tweaks
Also fix hide thumbnails
2013-08-25 17:12:00 -07:00
Zixaphir
2cb40a7f75 Add flex to our QR 2013-08-25 14:20:51 -07:00
Zixaphir
e6de614e14 Redo posts as flex
No more clearfix, no more "overflow: hidden", no more bullshit.
2013-08-25 13:48:05 -07:00
Zixaphir
ace2f6384f Release appchan x v2.3.8. 2013-08-25 12:59:16 -07:00
Zixaphir
44f83a756a Fix #329 2013-08-25 11:16:59 -07:00
Zixaphir
82d43423c5 Fix #440 2013-08-25 10:57:41 -07:00
Zixaphir
5201395246 Fix slideout threadwatcher, navigation, and PSA hover 2013-08-25 10:23:29 -07:00
Zixaphir
1450e61369 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
	src/Images/Gallery.coffee
2013-08-25 10:11:46 -07:00
Zixaphir
85f226d3d4 CSS 2013-08-25 10:08:47 -07:00
Zixaphir
4435b84f3f Sometimes, I'm dumb 2013-08-25 09:13:05 -07:00
Zixaphir
9353bcd50d Separate Gallery and Image Expansion fit width / height 2013-08-25 08:47:09 -07:00
seaweedchan
6598b5a45e Merge Zixaphir X 2013-08-25 01:15:47 -07:00
Zixaphir
75e54949ae Restore the double-border on .gal-next IF thumbnails aren't hidden 2013-08-24 22:20:39 -07:00
Mayhem
cec8bf186e Fix #1262. 2013-08-25 00:17:42 +02: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
c4fdaea615 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-08-24 13:08:23 -07:00
Zixaphir
c31e9cde8d Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
2013-08-24 12:20:01 -07:00