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

683 Commits

Author SHA1 Message Date
Zixaphir
7d4f0be88f Release appchan x v2.8.2. 2014-01-13 19:37:55 -07:00
Zixaphir
750ac760bb Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Header.coffee
 2014-01-13 19:36:02 -07:00
Zixaphir
6195487460 Merge branch 'v3' 2014-01-13 19:10:17 -07:00
Zixaphir
6d7533df49 Fix mascot positioning code. 
Style.mascot doesn't exist anymore, we moved all CSS into
the style.sheets object
 2014-01-13 18:34:35 -07:00
Zixaphir
1203260f21 Fix theme saving. 2014-01-13 18:22:39 -07:00
Zixaphir
9ecbcd1455 PaisleyChan fixes 2014-01-13 18:12:35 -07:00
Zixaphir
b1cf10fbd2 Release appchan x v2.8.1. 2014-01-13 13:39:10 -07:00
Zixaphir
8781f52a36 Remove the Force Reply Break option on Chrome 
Disabling it was broken, so now it's forced. Sorry.
 2014-01-13 13:36:51 -07:00
Zixaphir
94dd0e555f 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/Menu/Menu.coffee
 2014-01-13 13:25:43 -07:00
Zixaphir
f3731397da Delay Padding calculation until the header bar actually exists 2014-01-12 23:40:47 -07:00
Zixaphir
d2435777ff Well, who is dumb? I'm dumb. 2014-01-12 19:47:55 -07:00
Zixaphir
99a6565ca9 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Monitoring/Favicon.coffee
 2014-01-12 19:46:28 -07:00
Zixaphir
064b5480c3 Merge branch 'v3' 2014-01-12 19:22:04 -07:00
Zixaphir
ca153df551 Fix catalog, add some CSS for index features 2014-01-12 18:53:34 -07:00
Zixaphir
72d880383c Merge branch 'v3' 2014-01-12 18:04:19 -07:00
Zixaphir
ccba62bc70 Give themes a sense of "state", I guess. 2014-01-12 17:59:39 -07:00
Zixaphir
790ce952a7 Wait, wait, no. Escape that shit. 2014-01-12 17:46:05 -07:00
Zixaphir
77c64bc75a Implement a theme and mascot switcher between SFW/NSFW boards 2014-01-12 17:41:30 -07:00
Zixaphir
5ca10fc248 Less hard-coded NSFW boards 
Let's let 4chan tell us if a board is NSFW or not.
 2014-01-12 16:38:34 -07:00
Zixaphir
966882c11d Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html
 2014-01-12 15:26:45 -07:00
Zixaphir
f757aad8cb Remove mascot and theme tempfix 2014-01-12 15:06:34 -07:00
Zixaphir
2a7113ebdf Hide a harmless console error during rush conditions 2014-01-12 15:01:30 -07:00
Zixaphir
96338ebe0b Some empty select is causing issues, so I'm not gonna bother with it 2014-01-12 14:59:44 -07:00
Zixaphir
aa48ee519c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
 2014-01-12 14:56:32 -07:00
Zixaphir
41e6feacbb Add a pseudo element class for font awesome, use it for submenus 2014-01-12 14:13:56 -07:00
Zixaphir
0f1ab5c5a5 Finally make the Captcha Filter into an option 
I'm fairly certain I've "fixed" the invisible captcha issue, but
for whatever reason, someone might just not want a filter.
 2014-01-12 13:56:11 -07:00
Zixaphir
69f3ef7aa9 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-12 13:44:05 -07:00
Zixaphir
c13cbfce18 Release appchan x v2.8.0. 2014-01-11 21:33:45 -07:00
Zixaphir
2061eb1a75 Fix Mascot dialog 2014-01-11 21:15:58 -07:00
Zixaphir
9a5a4cc03c Merge branch 'v3' 2014-01-11 21:03:55 -07:00
Zixaphir
4710baf08c Merge branch 'v3' into ajson 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-11 19:35:00 -07:00
Zixaphir
75c76d5ed0 Don't know how I missed that while merging... 2014-01-11 16:57:17 -07:00
Zixaphir
f167a2f657 Merge branch 'json' into ajson 2014-01-11 16:14:29 -07:00
Zixaphir
bd08bd964d Merge branch 'json' into ajson 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	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/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
 2014-01-11 15:55:46 -07:00
Zixaphir
bf89175d41 Merge branch 'json' -- this was safe and performance friendly, so. 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-07 14:28:47 -07:00
Zixaphir
073f69d804 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Header.coffee
 2014-01-07 12:12:29 -07:00
Zixaphir
e22390fae7 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-07 11:46:54 -07:00
Zixaphir
87d1f7b454 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-07 10:50:03 -07:00
Zixaphir
59e0cacdfa Merge branch 'v3' 2014-01-07 10:28:51 -07:00
Zixaphir
7cf2bfc607 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
 2014-01-07 10:26:51 -07:00
Zixaphir
23118608b2 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-07 08:58:33 -07:00
Zixaphir
bde16c1a64 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-06 11:11:12 -07:00
Zixaphir
9408053741 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-01-04 19:52:34 -07:00
Zixaphir
9a8e84c7d1 Release appchan x v2.7.5. 2014-01-04 15:38:05 -07:00
Zixaphir
691f3e89d7 Small optimization 2014-01-04 14:52:04 -07:00
Zixaphir
22bedd63e0 Fix and optimize element rice code 2014-01-04 14:48:54 -07:00
Zixaphir
3d97b39f1b Fix an issue with new color code causing incorrect behavior with 
converting colors to hex codes
 2014-01-04 14:27:05 -07:00
Zixaphir
f4ea956be3 Accidentally broke all of this. Fix, refactor, golden. 2014-01-02 17:54:11 -07:00
Zixaphir
89ec27790d bugfix 2014-01-02 17:40:05 -07:00
Zixaphir
0733ceb3b6 Small refactor 2014-01-02 17:38:13 -07:00