189 Commits

Author SHA1 Message Date
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
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
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
9c5ca585ed Add setting to load captcha when you open the thread, disabled by default 2014-02-10 15:22:56 +01:00
Kabir Sala
a7b2565e5b Copy more from Zixaphir and Mayhem, proper(?) fix for Chrome 2014-02-10 04:45:04 +01:00
Kabir Sala
6c2579449a Release 4chan X v1.3.4. 2014-02-10 01:57:43 +01:00
Kabir Sala
b368b0bbb4 Mayhem: Minor captcha fix. 2014-02-10 01:14:10 +01:00
Kabir Sala
1b6052304b Stuff 2014-02-09 21:43:31 +01:00
Kabir Sala
3bd506e617 Copy Mayhem 2014-02-09 19:36:28 +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
Zixaphir
8bad58920a Fix not var in obj, var not in obj 2013-12-24 16:31:09 -07:00
Zixaphir
91233b8d61 remove [].contains. It was a bad idea.
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
2013-12-24 14:41:21 -07:00
Mayhem
a646d532b2 Split QR.coffee into multiple files. 2013-12-19 04:34:37 +01:00
Zixaphir
cadbea75b2 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
2013-11-26 12:19:19 -07:00
Mayhem
af21becff6 Fix #1347. 2013-11-25 13:21:37 +01:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
Mayhem
d5e7fa8d94 QR thumbnail previews creation should be aware of the device pixel ratio. 2013-11-16 20:38:48 +01:00
Mayhem
882670bc6b Screw the "Remove" text next to the QR post clear button, move to title tooltip. 2013-11-16 20:26:18 +01:00
Mayhem
1b8e55f0b4 Use fa-times-circle instead of fa-times for clearing actions. 2013-11-16 20:07:19 +01:00
Mayhem
ffc625259e Replace the times symbol with fa-times. #1338 2013-11-16 15:57:47 +01:00
Mayhem
451661077d Remove outdated temporary workarounds. 2013-11-04 10:48:35 +01:00
Mayhem
bc72f0f763 Create importHTML function, and use it. 2013-11-02 19:21:05 +01:00
Mayhem
0038f1f011 Slightly better consistency between "reload"/"refresh"/"update" usage. 2013-11-02 19:21:04 +01:00
Mayhem
22c561b796 Take into account dead threads in the watcher after an index refresh. 2013-11-02 19:21:04 +01:00
Mayhem
72b38da3af Regenerate the QR threads list correctly after an index refresh. 2013-11-02 19:21:04 +01:00
Mayhem
c2984275e5 Add index refresh shortcut in the header bar.
Also fix lazy/lame implementation of Header.addShortcut()
2013-11-02 19:21:04 +01:00
Mayhem
4ff5fd287a Update FontAwesome. 2013-10-23 21:13:10 +02:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-10-13 14:29:52 -07:00