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

1104 Commits

Author SHA1 Message Date
Zixaphir
147808a7d4 Release appchan x v2.7.1. 2013-12-24 16:53:43 -07:00
Zixaphir
af666d38cd Merge branch 'v3' 
Conflicts:
	src/Posting/QuickReply.coffee
 2013-12-24 16:32:48 -07:00
Zixaphir
8bad58920a Fix not var in obj, var not in obj 2013-12-24 16:31:09 -07:00
Zixaphir
ae789f4ad8 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/Posting/QuickReply.coffee
 2013-12-24 16:18:47 -07:00
Zixaphir
dab73f8cbb How did that even...? 2013-12-24 15:45:00 -07:00
Zixaphir
b060a9c23e Cheats. 
Don't do this. Why am I doing it, then? Because indexOf is so
slooooooooooooooooooooooooooooooooooooooooooooooooooooooooooow
 2013-12-24 15:33:39 -07:00
Zixaphir
7b4c794729 Sometimes logic gets a little too logical for me. 2013-12-24 15:10:03 -07:00
Zixaphir
91233b8d61 remove [].contains. It was a bad idea. 
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
 2013-12-24 14:41:21 -07:00
Zixaphir
cfb883d8da Alternative text for Refresh Shortcut. seaweedchan/4chan-x#212 
DUH, I DUMB
 2013-12-21 19:29:22 -07:00
Zixaphir
61a9364090 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Miscellaneous/CatalogLinks.coffee
 2013-12-18 16:58:07 -07:00
Zixaphir
3b1340433e Faster Catalog Links code 
Ours is based on @ihavenoface's old catalog code, not @MayhemYDG's,
so we don't particularly benefit from advancements in his code, per
se, without rechecking and validating the quality of our own. This
happens to be a case where we were stuck in an inefficient paradigm
and never revisited.

We now appear much closer to Mayhem's code, but are still mostly
absent from being merged into the rest of the Header code. Whether
we decide to merge or not should probably be discussed at some
point.
 2013-12-18 16:55:27 -07:00
Zixaphir
d7ceb42446 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/font-awesome.css
	src/Miscellaneous/CatalogLinks.coffee
 2013-12-18 16:17:11 -07:00
Zixaphir
2fa6e063ef Not sure how that happened. 2013-12-18 16:11:45 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
 2013-12-18 12:21:43 -07:00
Zixaphir
c36d62d5ce Cleanup and fix remaining issues from seaweedchan/4chan-x#212 2013-12-18 12:15:13 -07:00
Zixaphir
1c55dbd8aa Release appchan x v2.7.0. 2013-12-16 20:21:30 -07:00
Zixaphir
b43383769d Merge branch 'v3' 2013-12-16 20:12:39 -07:00
Zixaphir
7ad173c385 I am so dumb 2013-12-16 20:12:31 -07:00
Zixaphir
baa9f93fab Adblock again 2013-12-16 20:11:31 -07:00
Zixaphir
5f0717ff57 Merge branch 'v3' 2013-12-16 20:08:10 -07:00
Zixaphir
75b7804eda Fix and recomprehense the setInterval function 2013-12-16 20:07:27 -07:00
Zixaphir
717bcd557d Fix autohide on scroll 2013-12-16 19:34:56 -07:00
Zixaphir
ed84637551 Post without name keybind? close #491 2013-12-16 19:23:14 -07:00
Zixaphir
9d69beb137 Sane defaults for body padding 2013-12-16 19:06:54 -07:00
Zixaphir
9a96253e62 Fix filename expansion 2013-12-16 18:57:15 -07:00
Zixaphir
1dfe5582c5 Fix #499, trashcan icon 2013-12-16 18:53:12 -07:00
Zixaphir
16b650f26c Ads Please! 2013-12-16 18:49:25 -07:00
Zixaphir
57f7d899ec Some last FappeTyme/WerkTyme tweaks 2013-12-16 18:36:09 -07:00
Zixaphir
7958371a24 I have no idea how I enabled that by default. I == dumb 2013-12-16 18:29:45 -07:00
Zixaphir
68bc40cc45 Merge branch 'v3' 
Conflicts:
	src/Images/FappeTyme.coffee
 2013-12-16 14:12:42 -07:00
Zixaphir
0033c5370f Don't make last minute changes without testing. ;__; 2013-12-16 14:11:15 -07:00
Zixaphir
b7d6fa2659 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
 2013-12-16 14:05:03 -07:00
Zixaphir
0e1b8c099c Forgot a return 
Also consistency.
 2013-12-16 14:03:30 -07:00
Zixaphir
e156cc8e9c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
 2013-12-16 14:01:47 -07:00
Zixaphir
0cafd9ae61 Merge @mahkoh's embedding fixes 2013-12-16 13:45:56 -07:00
Zixaphir
cc5cf4f124 Update archives 2013-12-16 13:41:12 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
 2013-12-16 12:56:09 -07:00
Zixaphir
b396ef982f Fix a couple more classes 2013-12-16 12:25:39 -07:00
Zixaphir
bdba59eccc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.coffee
	package.json
	src/Miscellaneous/Keybinds.coffee
 2013-12-09 19:00:56 -07:00
Zixaphir
33bc02d8b0 Release appchan x v2.6.4. 2013-12-06 17:31:20 -07:00
Zixaphir
e5e8d3b564 Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
 2013-12-06 17:29:47 -07:00
Zixaphir
8b14d8bd8f Fix header positions 2013-12-06 17:22:47 -07:00
Zixaphir
6c47fb300a Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
 2013-12-06 17:20:48 -07:00
Jordan Bates
4fd8e6a4bf Release 4chan X v1.2.44. 2013-12-06 17:11:47 -07:00
Zixaphir
adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee
 2013-12-06 17:11:36 -07:00
Jordan Bates
382943a266 Cooldown fix, from Mayhem 2013-12-06 17:09:57 -07:00
Jordan Bates
16fc57ca2d Merge mayhems fix for #214 2013-12-06 17:02:56 -07:00
Jordan Bates
16e2afa916 Update for moot's markup change, close #213 2013-12-06 16:57:35 -07:00
Zixaphir
30b6c08922 Release appchan x v2.6.3. 2013-11-27 17:36:31 -07:00