130 Commits

Author SHA1 Message Date
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
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
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
Kabir Sala
d8a168a549 More work on post from url 2014-02-11 23:37:52 +01:00
Kabir Sala
f0bd6b1b04 Start working on remote upload (Chrome-only so far) 2014-02-11 18:32:23 +01:00
Kabir Sala
a7b2565e5b Copy more from Zixaphir and Mayhem, proper(?) fix for Chrome 2014-02-10 04:45:04 +01:00
Mayhem
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog
Drop support for the inline catalog
2014-02-05 18:03:40 +01:00
Mayhem
3887e184b8 Close #1416 2014-02-02 17:45:29 +01:00
Mayhem
f080a15292 Merge branch 'v3' into catalog 2014-02-01 00:32:17 +01:00
Mayhem
dac4ccbead Hide the persistent QR in the catalog. 2014-01-31 23:30:54 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
2014-01-22 12:10:34 -07:00
Zixaphir
f37484cd33 HTTPS for posting, always. 2014-01-19 16:20:21 -07:00
Zixaphir
a993b440dc Try to get some better errors out of QR.req.onerror
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/layout.css
2014-01-19 16:19:18 -07:00
Zixaphir
8ddf2b4e5f Start working on tightening our control of the Navigation context
Currently breaks posting.

TODO:
* Fix style switching from NSFW to SFW (SFW to NSFW works)
  - It is worth noting this used to work.
* Fix post form not updating its currently selected thread.
* Fix navigation between threads in different boards (same boards
  works? Maybe?)
* Handle race conditions due to pop states.
  - I'm having a lot of trouble wrapping my mind around this one.
    Mostly due to the fact that I have no idea where to begin with
    it. But this isn't a big issue unless you pop state multiple
    times within seconds.

    I just need some exceptions when we try to disconnect features
    that haven't even finished connecting due to threads not being
    available yet.

Most of the early issues, like double-backlinks, incorrect
thumbnails, etc, have been fixed, I think. Or at least I'm no
longer running into them all the time.
2014-01-18 02:34:18 -07:00
Zixaphir
c8514d1029 Fix posting when navigating to new boards via JSON 2014-01-17 16:24:49 -07:00
AchtBit
8c3e46d23b Fix wait error regex
There are 2 spaces separating the number of seconds.
2014-01-17 00:33:43 -06:00
Zixaphir
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -07:00
Zixaphir
c61c71c764 Fix the QR's state upon navigation with JSON 2014-01-10 22:54:30 -07:00
Zixaphir
890277f296 Update QR depending on state. 2014-01-09 23:20:38 -07:00
Zixaphir
b38f63e313 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/lib/$.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-12-25 10:54:21 -07:00
Mayhem
a646d532b2 Split QR.coffee into multiple files. 2013-12-19 04:34:37 +01:00