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

896 Commits

Author SHA1 Message Date
Zixaphir
46f29fd094 Fix an endless recursion loop 2014-04-06 21:20:58 -07:00
Zixaphir
824f4d3e78 Correctly this time, please 2014-04-06 21:03:29 -07:00
Zixaphir
68a76a25f2 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
	src/General/UI.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-06 20:47:38 -07:00
Zixaphir
a2cacec59a Fix header autohide not showing on hover. 2014-04-06 20:33:01 -07:00
ccd0
b2f4a8daf0 turn JSON navigation off by default 2014-04-06 19:21:23 -07:00
ccd0
47eea2a57a implement duckness's upgrade nag disabling option 2014-04-06 16:10:05 -07:00
ccd0
0f770459c0 get new hover working in catalog 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/UI.coffee
	src/Images/ImageHover.coffee
 2014-04-06 16:06:11 -07:00
ccd0
74ef633fd7 better approach to hover css 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-06 16:04:36 -07:00
ccd0
80b2eae41b css fix 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-06 16:03:03 -07:00
Zixaphir
7818dec073 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Index.coffee
	src/Images/ImageHover.coffee
 2014-04-06 11:49:45 -07:00
ccd0
31eac580aa implement duckness's upgrade nag disabling option 2014-04-06 10:17:26 -07:00
ccd0
e1c9330250 get new hover working in catalog 2014-04-05 21:59:29 -07:00
ccd0
904af13063 better approach to hover css 2014-04-05 20:11:38 -07:00
ccd0
f88883887a css fix 2014-04-05 18:46:18 -07:00
ccd0
782fd7ad05 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-05 18:21:07 -07:00
ccd0
dcda06c40c Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-05 17:36:35 -07:00
ccd0
730f275406 remove unneeded entry from feature initialization list 2014-04-05 14:20:18 -07:00
Mayhem
a65c724cfb Fix #1536 2014-04-05 14:03:32 +02:00
Mayhem
20846ad4fe Fix #1511 2014-04-05 13:40:54 +02:00
ccd0
342672bab3 implement length 1 queue of videos to be deleted 2014-04-04 22:11:17 -07:00
Zixaphir
f6353729eb Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee
 2014-04-04 20:24:12 -07:00
Zixaphir
4b28626410 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageHover.coffee
	src/Posting/QR.coffee
 2014-04-04 16:10:07 -07:00
Zixaphir
e4c395a7cd Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
 2014-04-04 15:41:15 -07:00
ccd0
07d5b9eeb8 global sound option 2014-04-04 15:35:16 -07:00
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02:00
ccd0
26576b4420 video hover 2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a add video expansion 2014-04-04 11:56:10 -07:00
ccd0
3fa34d3e69 fix updates.xml 2014-04-03 16:29:35 -07:00
ccd0
f53752c20c use gh-pages for updates 2014-04-03 15:59:40 -07:00
Zixaphir
4756274a73 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Posting/QR.coffee
 2014-04-03 14:58:07 -07:00
Zixaphir
46478eb4d0 Merge branch 'duckness' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-03 14:52:55 -07:00
ccd0
1832f124c8 Update archives with data from MayhemYDG fork 2014-04-03 14:52:25 -07:00
ccd0
7f3d330ba4 Add updater for Chrom* extension. 2014-04-03 14:03:05 -07:00
ccd0
bf6e918d0d Release 4chan X v1.4.2. 2014-04-02 21:47:46 -07:00
Zixaphir
cefb710c04 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Header.coffee
 2014-03-27 13:50:02 -07:00
Zixaphir
f6ea1ed52c Don't clean empty data. 2014-03-26 11:16:05 -07:00
ccd0
4f260137f1 embed direct video links 2014-03-25 00:50:41 -07:00
Zixaphir
e20a822481 Since we already are generating keys, lets use them. 2014-03-23 17:46:21 -07:00
Zixaphir
55e43147ed Redundant 2014-03-23 12:32:40 -07:00
Zixaphir
4c09eed4cd Holy shit loops 2014-03-21 16:35:27 -07:00
Zixaphir
282a2338d8 One more thing from master branch 2014-03-20 09:55:32 -07:00
Zixaphir
18db3994b6 Backport fixes from master branch 2014-03-20 09:37:27 -07:00
Mayhem
d1a305a888 Hide and don't use the header hitzone when unnecessary. 2014-03-20 16:21:22 +01:00
Zixaphir
99babc304a Oops 2014-03-14 17:29:02 -07:00
Zixaphir
be4be5a94b Fix post fetching 2014-03-14 17:08:00 -07:00
Zixaphir
ca9abdc4e7 Remove Main.callbacknodes 2014-03-14 16:02:19 -07:00
Zixaphir
5581b53414 Fix thread page numbers 2014-03-13 15:23:25 -07:00
Zixaphir
91a63d1bc2 Fix an issue causing a blank index when navigating 
Status 304 a bitch.
 2014-03-13 15:15:58 -07:00
Zixaphir
9b9a2980aa Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	README.md
	css/style.css
	html/General/Header.html
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
 2014-03-13 14:30:39 -07:00
Zixaphir
f81c03f5a2 Eliminate Index.liveThreadIDs 2014-03-13 13:56:48 -07:00