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

3140 Commits

Author SHA1 Message Date
Zixaphir
e5230e6457 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
 2014-04-05 05:39:32 -07:00
Zixaphir
22d7295217 I'm having a bad morning. 2014-04-05 05:39:01 -07:00
Zixaphir
eb91edaf6d Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
 2014-04-05 05:33:14 -07:00
Zixaphir
813ebd3039 Fix file input 2014-04-05 05:32:13 -07:00
Mayhem
12b6fee222 Changelog. 2014-04-05 14:07:50 +02:00
Mayhem
a65c724cfb Fix #1536 2014-04-05 14:03:32 +02:00
Mayhem
62321ecb18 Fix #1537 2014-04-05 13:53:52 +02:00
Mayhem
9ee39b3908 Re-setup the QR captcha when necessary. Fix #1534 2014-04-05 13:45:34 +02:00
Mayhem
20846ad4fe Fix #1511 2014-04-05 13:40:54 +02:00
Zixaphir
6760dcf09f Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-05 01:03:36 -07:00
Zixaphir
df78c2e1f8 Handle captcha errors with a new captcha! 2014-04-05 01:02:43 -07:00
Zixaphir
2ba7ae5d28 I like that better 2014-04-05 00:58:57 -07:00
Zixaphir
af843c0c6d Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-05 00:47:29 -07:00
Zixaphir
4d8e4b62da Reload captcha if there are posts in the queue. 2014-04-05 00:46:16 -07:00
ccd0
342672bab3 implement length 1 queue of videos to be deleted 2014-04-04 22:11:17 -07:00
Zixaphir
ef886aea7f Merge fail. 2014-04-04 20:50:30 -07:00
Zixaphir
453ebe7e74 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-04 20:28:21 -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
4a26b5ea14 Firefox doesn't seem to like displaying videos as blocks? 2014-04-04 17:28:44 -07:00
Zixaphir
66f449cced Cleanup 2014-04-04 17:11:41 -07:00
Zixaphir
f6898b8c03 Change some things around 2014-04-04 17:05:53 -07:00
Zixaphir
11b699a0b6 Damn typos. 2014-04-04 16:27:37 -07:00
Zixaphir
276a08d6e6 iHover is now a class 2014-04-04 16:15:07 -07:00
Zixaphir
8536ae3d37 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
 2014-04-04 16:12:31 -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
337b43591b Fix webm PDF bug 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-04 16:07:08 -07:00
Zixaphir
dbf47f0748 Extensions on the Chrome Webstore don't use updates.xml 2014-04-04 16:03:22 -07:00
Zixaphir
6dcbb80070 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
 2014-04-04 16:01:06 -07:00
Zixaphir
372c54068c Fix webm PDF bug 2014-04-04 15:44:11 -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
9ca9360ffd add WebM to supported posting types, bypass width/height check for now 2014-04-04 15:30:21 -07: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
Zixaphir
b18edaa764 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-03 16:25:45 -07:00
Zixaphir
523482cfcd Fix Link Title 2014-04-03 16:25:07 -07:00
ccd0
f53752c20c use gh-pages for updates 2014-04-03 15:59:40 -07:00
Zixaphir
4d46c17073 Merge branch 'vampiric' 2014-04-03 15:33:39 -07:00
Zixaphir
b662cf2366 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/css/style.css
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-03 15:19:41 -07:00
Zixaphir
27b745ce7d Smart 2014-04-03 15:06:48 -07:00
Zixaphir
6df7f1c4da Small flags input reflow 2014-04-03 15:05:36 -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
ccd0
e6988c92a5 use rbt.asia URL 2014-04-03 14:57:48 -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
b2787128e1 fix flag input field removal 2014-04-03 12:10:32 -07:00
ccd0
d943bf5024 fix navigation bug 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-03 05:15:22 -07:00