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

333 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
ccd0
6780ef629d fix navigation bug 2014-04-03 04:55:31 -07:00
ccd0
bf6e918d0d Release 4chan X v1.4.2. 2014-04-02 21:47:46 -07:00
Zixaphir
1f9d5e2221 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-02 19:17:49 -07:00
Brandon
9c11798308 move that where it belongs 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-02 19:17:19 -07:00
Brandon
0d34429ee0 fix uploading swfs on /f/ 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-02 19:16:51 -07:00
Mayhem
fd703d42ba Fix captchas, again. #1531 
Conflicts:
	CHANGELOG.md
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-02 17:51:14 -07:00
Zixaphir
9f7026e419 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Posting/QR.captcha.coffee
 2014-04-02 17:21:16 -07:00
Zixaphir
8f62341949 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-02 17:12:15 -07:00
Mayhem
7bc7aed998 Fix captchas, again. #1531 2014-04-03 01:47:38 +02:00
Bjorn Lim
2b16fa924f Update QR.captcha.coffee 
added changes from MayhemYDG to solve captcha issue
 2014-03-29 18:18:51 +08:00
Zixaphir
df2a5f3fc0 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-27 13:55:02 -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
Mayhem
825236a002 Fix #1524. 2014-03-27 21:31:16 +01:00
Zixaphir
e459069ae6 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/InfiniScroll.coffee
	src/Posting/QR.coffee
 2014-03-13 18:12:44 -07:00
Zixaphir
2a703f08a2 Fix a bug where the QR not being enabled could break JSON Navigation 2014-03-13 00:26:08 -07:00
Zixaphir
9570834963 Fix hover-descriptions 2014-03-08 17:37:49 -07:00
Zixaphir
1de6c29a51 Fix captcha (again) 2014-03-06 21:38:31 -07:00
Zixaphir
c440c236ad Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
 2014-03-06 20:18:33 -07:00
Zixaphir
bc15231170 lelwat 2014-03-06 20:17:13 -07:00
Zixaphir
fe8c67e03e Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/CustomCSS.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteYou.coffee
 2014-03-06 20:15:45 -07:00
Zixaphir
61942d9e2d Remove unnecessary debug code 2014-03-06 11:10:08 -07:00
Zixaphir
a9e4559f1e Get rid of another unnecessary loop of my own design 2014-03-06 11:06:12 -07:00
Zixaphir
7a7a7facf7 Reflow a ton of navigate and index shit to fix broken shit 2014-03-02 21:04:14 -07:00
Zixaphir
1fc83f9b95 MISTAKES WERE MADE! 2014-03-02 19:13:16 -07:00
Zixaphir
93a2ebbf71 Fix a bug causing the QR to not load correctly. 
I don't know why we were using @ready.
 2014-03-02 19:10:38 -07:00
Zixaphir
a4ead91d65 Remove some accidental cruft left from incorrectly merging 
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers
 2014-03-02 18:59:35 -07:00
Zixaphir
5a1bebf14d Merge branch 'master' of https://github.com/Spittie/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Posting/QR.coffee
 2014-03-01 14:53:36 -07:00
Kabir Sala
e8992deab7 Better check for dimensions, thanks Zixaphir 2014-03-01 21:23:16 +01:00
Kabir Sala
00f8c54f29 Better #16 2014-03-01 04:44:55 +01:00
Kabir Sala
387ebcad4f Update archives 2014-03-01 04:40:45 +01:00
Zixaphir
553a5a9133 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/Posting/QR.coffee
 2014-02-28 19:37:26 -07:00
Kabir Sala
18747bc5f9 Fix typo 2014-02-28 20:14:58 +01:00