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

339 Commits

Author SHA1 Message Date
Zixaphir
4c071abe62 Work on #856 2015-01-14 21:08:58 -07:00
Zixaphir
d209c0a296 Remove DiceRoll 2015-01-14 08:18:01 -07:00
Zixaphir
6015bfe4a7 Fix long-broken CatalogLinks header generation 2015-01-13 17:24:58 -07:00
Zixaphir
4ef2b61c25 Fix Labels, IDColor, IDHighlight 2015-01-13 17:06:11 -07:00
Zixaphir
ba380613ed One more #boardNavDesktopFoot 2015-01-13 10:18:12 -07:00
Zixaphir
3d3fc0a868 Finish Miscellaneous features (for now), almost finish Monitoring 2015-01-09 22:21:30 -07:00
Zixaphir
108129ca78 Remembering how keybinds work is hard. 2015-01-09 20:40:02 -07:00
Zixaphir
13d5542997 Keybinds 2015-01-09 20:28:20 -07:00
Zixaphir
f10b3ad9f6 IDHighlight 2015-01-09 20:08:31 -07:00
Zixaphir
2a94bb7150 Update Dice, Fourchan, and IDColor 2015-01-09 20:05:44 -07:00
Zixaphir
32e5eba15d Banners.coffee 
Move into Miscellaneous from Theming.
 2015-01-09 19:45:56 -07:00
Zixaphir
f158c839aa More merging 2015-01-09 19:38:31 -07:00
ccd0
7f920b552f fix privilege escalation vulnerability 
Conflicts:
	src/General/Settings.coffee
	src/Quotelinks/QuoteBacklink.coffee
 2014-10-09 11:51:41 -07:00
Zixaphir
3581b32994 Try to do some proper error handling on index load 
Also, I thought I nuked InfinitScroll.coffee ages ago?
 2014-08-17 19:34:17 -07:00
Zixaphir
8ba4898158 Fix an issue where catalog links were affecting external links #773 2014-07-31 14:04:15 -07:00
Zixaphir
04c60a62ef Implement #675 2014-07-27 16:27:53 -07:00
Zixaphir
bf8fedb659 Merge @ccd0's title fix. 
Make some funny changes to IDColor
 2014-07-26 18:57:41 -07:00
Zixaphir
64c9c139c1 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
 2014-06-22 07:13:41 -07:00
Zixaphir
f103fd0301 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.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.post.coffee
 2014-06-22 07:04:25 -07:00
Mayhem
41c22af15f GM2 incoming! 2014-06-19 04:34:37 +02:00
Mayhem
cc4ff57993 Don't double number captchas when reporting too. 2014-06-13 01:55:41 +02:00
Mayhem
4c17333f53 Fix #1669. 2014-06-13 01:42:45 +02:00
Brandon
994296f2cc fix /f/ sauce 2014-06-05 01:49:34 -07:00
Zixaphir
13236e18d3 Merge branch 'master' of github.com:zixaphir/appchan-x 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-27 12:39:51 -07:00
Zixaphir
2efa358131 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/CatalogLinks.coffee
	src/Posting/QR.coffee
 2014-05-27 12:39:01 -07:00
Zixaphir
05de96fd0b Try again on zixaphir/appchan-x#724 2014-05-16 09:25:51 -07:00
Zixaphir
a0f5efdcc7 Attempt to resolve zixaphir/appchan-x#724 2014-05-16 09:21:15 -07:00
Zixaphir
4f820ad8de 4gropes has been broken for awhile, I guess? Fix #687 
If anyone has a new catalog to replace 4gropes, CC me.
 2014-05-11 19:42:13 -07:00
Brandon
de2d6a0303 /f/ security issue #722 2014-05-09 10:53:56 -07:00
Brandon
ae997753e2 fix #720 2014-05-04 16:13:40 -07:00
Zixaphir
93c5ecae9c Merge branch 'v3' 2014-05-03 16:07:23 -07:00
Zixaphir
0faacd737e Revert "Lets pretend we're smarter than we really are!" 
This reverts commit 393eb3ec2289293dd4d4caaef17db33bb695fa30.

Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-05-03 16:05:46 -07:00
Zixaphir
c04c83f915 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Theming/Banner.coffee
 2014-05-03 06:20:04 -07:00
Zixaphir
ec77ec1e84 QuoteYou > QuoteMarkers 2014-05-03 03:35:33 -07:00
Zixaphir
a1601d8825 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Monitoring/ThreadStats.coffee
 2014-05-03 02:45:58 -07:00
Zixaphir
523d6bd9c4 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/css/style.css
	src/General/html/Build/post.html
	src/General/html/Features/Index-navlinks.html
	src/General/lib/post.class
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/Banner.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/Quotify.coffee
 2014-05-03 02:03:35 -07:00
Zixaphir
ca9b0517de Merge some changes from appchan. 2014-05-03 01:09:35 -07:00
Mayhem
a9b05047be Build pathnames taking into account the thread slug. 2014-04-30 15:30:46 +02:00
ccd0
e1ff987c1e enable keybinds on catalog 2014-04-26 22:51:48 -07:00
ccd0
c1ea97cb6f remove old InfiniScroll code 2014-04-26 19:39:17 -07:00
ccd0
cc0cc82c4c fix comment expansion 2014-04-20 01:21:37 -07:00
ccd0
823eace903 begin work on restoring comment expansion 2014-04-19 21:44:13 -07:00
ccd0
bf45917000 Merge branch 'newnames' 
Conflicts:
	src/General/lib/post.class
 2014-04-19 16:57:17 -07:00
Zixaphir
41ec3933cd Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Posting/QR.coffee
 2014-04-19 15:48:11 -07:00
ccd0
ec03ab524d Merge branch 'page1' 2014-04-19 15:28:56 -07:00
ccd0
7aeb46abb9 transition to new HTML 2014-04-19 00:28:19 -07:00
ccd0
a452b732fd change res -> thread in JSON API URLs 2014-04-13 01:46:18 -07:00
ccd0
c5b06f6988 Merge branch 'page1' into newnames 2014-04-13 01:38:24 -07:00
ccd0
9fe486d637 Merge branch 'master' into page1 2014-04-13 01:19:02 -07:00
ccd0
814b64b31c update URLs to 4cdn.org 2014-04-12 22:37:27 -07:00