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

1352 Commits

Author SHA1 Message Date
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
251eaf802f Fix Favicon on Catalog 2014-01-12 19:44:47 -07:00
Zixaphir
f8035ffded Dammit 2014-01-12 19:25:16 -07:00
Zixaphir
064b5480c3 Merge branch 'v3' 2014-01-12 19:22:04 -07:00
Zixaphir
2c6a26ca89 Fix catalog link, fix Index on catalog. 
It should have never ran on catalog, honestly.
 2014-01-12 19:21:21 -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
678e4d1116 I guess that got reverted in a merge. 2014-01-12 18:03:54 -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
2bf8d37781 Add the 4chanJS favicon to settings 2014-01-12 15:24:00 -07:00
Zixaphir
36826cac3e Merge some old favicon changes from appchan that never made it back 
to v3
 2014-01-12 15:20:39 -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
1b368e4edc Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Index.coffee
 2014-01-12 14:52:47 -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
860ca555b7 This line was in error. 
QR Personas are *always* enabled.
 2014-01-12 13:43:10 -07:00
Jordan
1c253782e8 Release 4chan X v1.3.1. 2014-01-12 09:51:00 -07:00
Jordan
a1cc8dab01 Infinite scrolling index mode 
Close #236
 2014-01-12 09:46:36 -07:00
seaweedchan
9a5ddc35d2 Merge zixaphirs typo fix 
Close #237
 2014-01-12 00:57:36 -07:00
Zixaphir
6ed2f67fe2 Holy shit fuck me with a chainsaw I'm so retarded I deserve it 
(but really plz don't, I'm just tired and this is a tired-zix commit)
Halp
 2014-01-12 00:00:33 -07:00
Jordan
a1e3793cb5 Make a few changes specific to the fixed header 
Close #239
 2014-01-11 22:18:03 -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
43bcc64681 Let Index.update handle its own page functions 2014-01-11 21:02:56 -07:00
Zixaphir
79776710af return 2014-01-11 20:22:45 -07:00
Zixaphir
ab3a4c6640 Get hash navigation working with Navigate.navigate() 2014-01-11 20:21:25 -07:00
Zixaphir
2e242a9f9d Holy, how tired was I when I did that? Damn. 2014-01-11 19:52:49 -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
495567682b Fix duplicate backlinks 2014-01-11 19:34:07 -07:00
Zixaphir
cb39424dea Reduce number of loops in Redirect 2014-01-11 17:19:19 -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
2b1a49b02e That didn't work as expected. 2014-01-11 16:14:16 -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
a02705f520 Errors are handled differently now 2014-01-11 15:09:00 -07:00
Zixaphir
c7f0646c42 Better 2014-01-11 15:06:55 -07:00
Zixaphir
efc2fd5bd2 Safer 2014-01-11 15:05:37 -07:00
Zixaphir
dcb734afff Small fix to backlinks code 2014-01-11 14:54:41 -07:00
Zixaphir
bf80874f9f Less checks and less misses? Performance and stability? Oh my. 2014-01-11 14:39:14 -07:00