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

142 Commits

Author SHA1 Message Date
Zixaphir
7301f43289 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/css/yotsuba-b.css
	src/Images/FappeTyme.coffee
 2014-03-06 23:07:49 -07:00
Zixaphir
c7e5833dc9 Remove more references to the non-existent "catalog" view 2014-03-06 22:36:42 -07:00
Zixaphir
fe8c67e03e Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/CustomCSS.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteYou.coffee
 2014-03-06 20:15:45 -07:00
Zixaphir
a4ead91d65 Remove some accidental cruft left from incorrectly merging 
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers
 2014-03-02 18:59:35 -07:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet) 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2014-02-23 14:04:45 -07:00
Mayhem
498dfda2ef Update code related to hidden threads. 2014-02-22 00:17:48 +01:00
Brandon
f7a3044409 Fix /f/ FappeTyme 2014-02-17 15:08:11 -08:00
Zixaphir
a9ff7e8d7e Fix Gallery menu-button 2014-02-16 04:40:35 -07:00
Mayhem
c685b0a5d6 Fix ImageExpand/Hover's error handling xhring the wrong URL. 2014-02-11 09:38:14 +01:00
Mayhem
bbf7abd6fa Close #1433. 2014-02-08 18:19:37 +01:00
Mayhem
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog 
Drop support for the inline catalog
 2014-02-05 18:03:40 +01:00
Mayhem
0675146d22 Add pin/hide/show thread menu entries for the catalog. 2014-02-04 13:51:21 +01:00
Mayhem
d6030f7df0 Set the catalog thumbnail via background image, save one element. 
Also tiny fixes here and there.
 2014-02-03 13:51:25 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Mayhem
44e28961fd Add Auto-GIF support in the catalog. 2014-01-29 15:22:46 +01:00
Mayhem
6dc91cfbdc Add Image Hover support in the catalog. 
Close #836
 2014-01-29 15:01:29 +01:00
Zixaphir
9199f12ce0 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/Sauce.coffee
 2014-01-28 01:14:01 -07:00
Zixaphir
2ac2286ad5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee
 2014-01-28 01:11:06 -07:00
Zixaphir
1f49ef2212 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Settings/Settings.html
	src/Miscellaneous/AnnouncementHiding.coffee
 2014-01-26 11:40:50 -07:00
ParrotParrot
0aaa9af8cc changed to lowercase 2014-01-25 20:35:12 +01:00
ParrotParrot
dbd4de88b1 %NAME is indeed better 2014-01-25 20:31:27 +01:00
ParrotParrot
7a2faf861e Added %FNAME case to link.replace switch 2014-01-25 20:10:40 +01:00
Zixaphir
b62d82bed0 Mayhem made responseType JSON default for any URL containing .json. 2014-01-24 14:48:39 -07:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
 2014-01-22 12:10:34 -07:00
Mayhem
1eaf43e39a Fetch the image's HEAD status to see if it's still available or not. 
Chrome bypasses the lack of CORS because we've allowed `i.4cdn.org` in the manifest.
 2014-01-22 16:52:46 +01:00
Zixaphir
f301f1c2c2 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-21 13:59:05 -07:00
Zixaphir
702a343f5e Fix image expansion 
DURR
 2014-01-21 13:57:28 -07:00
Mayhem
710655f13e Use xhr.responseType = 'json'. 2014-01-21 14:46:26 +01:00
Zixaphir
cc7decfd34 Merge branch 'v3' 2014-01-17 13:23:36 -07:00
Zixaphir
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -07:00
Jordan
26ee14e688 Update font-awesome 2014-01-08 23:33:52 -07:00
Zixaphir
996080cab9 Merge branch 'v3' 
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Menu/Menu.coffee
	src/Posting/QR.coffee
 2013-12-25 11:23:41 -07:00
Zixaphir
6dd2e60e9a Element.contains was not Array.contains, lol 2013-12-25 10:10:51 -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
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
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
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
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
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -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
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
Mayhem
3efffe8a6e Fix 4chan X for markup change. 2013-12-07 00:03:55 +01:00
Zixaphir
33c8bdc32d Release appchan x v2.6.1. 2013-11-27 17:04:13 -07:00
Zixaphir
3ad1c6040c Redo FontAwesome stuff, I guess. 2013-11-23 13:23:36 -07:00
Zixaphir
34140232fb Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/General/lib/notice.class
	src/General/meta/metadata.js
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

worksforme.png
 2013-11-23 12:56:42 -07:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything 
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
 2013-11-22 17:25:06 -07:00
Mayhem
985afb2a1a Support 4cdn. 2013-11-21 23:11:02 +01:00
Mayhem
6975a766b9 Update font-awesome. 2013-11-07 22:34:41 +01:00