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

238 Commits

Author SHA1 Message Date
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
d943bf5024 fix navigation bug 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-03 05:15:22 -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
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
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
2a703f08a2 Fix a bug where the QR not being enabled could break JSON Navigation 2014-03-13 00:26:08 -07:00
Zixaphir
bc15231170 lelwat 2014-03-06 20:17:13 -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
Kabir Sala
e72026cc95 Better #16 2014-02-28 20:06:27 +01:00
Kabir Sala
80c810d5c6 Merge branch 'master' of github.com:Spittie/4chan-x 2014-02-27 21:14:08 +01:00
Kabir Sala
a817de9180 Remove moot ads, #15 2014-02-27 21:11:08 +01:00
Kabir Sala
49f1ef529d Check image size, #16 2014-02-27 17:33:35 +01:00
Kabir Sala
903ebad815 Respect Auto Hide QR in the catalog 2014-02-25 13:25:59 +01:00
Kabir Sala
a5f58231b1 Fix the QR in the catalog 2014-02-24 22:00:04 +01:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet) 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2014-02-23 14:04:45 -07:00
Zixaphir
6884039627 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/Archive/Redirect.coffee
	src/Posting/QR.coffee
 2014-02-23 08:49:32 -07:00
Mayhem
4860b59d1b Fix quoting on Firefox. 2014-02-22 00:17:22 +01:00
Mayhem
f456495160 Quoting now also includes the spoiler and code tags. 2014-02-21 17:45:39 +01:00
Kabir Sala
798b6dd7d2 ... 2014-02-20 23:54:18 +01:00
Kabir Sala
5916115cd8 Merge zix v3 2014-02-20 23:33:47 +01:00
Kabir Sala
a06862e858 Fix, I'm an idiot that doesn't understand scope, and can't even copy/paste from someone else 2014-02-20 21:32:04 +01:00
Zixaphir
87d3624442 Merge Mayhem's QR fix 2014-02-20 12:57:24 -07:00
Kabir Sala
3986298f4f Copy fix from Mayhem, hopefully I didn't break anything 2014-02-20 20:56:49 +01:00
Mayhem
cbf60059b8 Fix the QR. 2014-02-20 20:29:11 +01:00
Kabir Sala
3a1e1426af silly kate 2014-02-18 16:11:33 +01:00
Kabir Sala
fb7328ce82 Update builds 2014-02-18 16:10:42 +01:00
Kabir Sala
a9460f0513 Fix Chrome 2014-02-17 18:53:30 +01:00
Zixaphir
6dd0cac797 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/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
 2014-02-16 01:00:41 -07:00
Kabir Sala
af2589d0e2 Fixes, better code(?) 2014-02-13 18:28:09 +01:00
Kabir Sala
cff413769e cleanup 2014-02-12 23:56:30 +01:00
Kabir Sala
fe4b037536 More fixes 2014-02-12 23:30:49 +01:00
Kabir Sala
a439ecf4f2 Add filename 2014-02-12 05:15:17 +01:00
Kabir Sala
15d8da033a Fix posting from url in Firefox 2014-02-12 03:22:13 +01:00
Kabir Sala
eeb95bbb9f fix 2014-02-12 00:22:00 +01:00