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
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
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
03c25ee34a
add video expansion
2014-04-04 11:56:10 -07:00
Zixaphir
f903abd165
Merge branch 'v3'
...
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
2014-03-14 17:09:32 -07:00
Zixaphir
be4be5a94b
Fix post fetching
2014-03-14 17:08:00 -07:00
Zixaphir
a3437ff0ae
Merge branch 'v3'
2014-03-11 16:01:24 -07:00
Zixaphir
6bb31cc845
Filtered posts are now added to the PostHiding DataBoard
...
Fixes #632
2014-03-11 15:59:47 -07:00
Zixaphir
3dd84a69ac
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
2014-03-11 14:57:15 -07:00
Zixaphir
3f438d55ff
Tighten up Get.threadFromRoom, Get.contextFromNode
2014-03-11 11:57:30 -07:00
Zixaphir
f685dfe750
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/css/style.css
2014-03-10 12:49:26 -07:00
Zixaphir
c6954ee1bb
Forgot a couple.
2014-03-10 08:57:19 -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
db5cccc70f
Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)
...
Conflicts:
css/burichan.css
css/futaba.css
css/photon.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Settings-section-Main.html
html/General/Settings.html
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Settings.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadUpdater.coffee
2014-02-28 19:59:04 -07: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
4a2249d0ec
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Navigate.coffee
src/Posting/QR.coffee
2014-01-18 20:01:02 -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
cc7decfd34
Merge branch 'v3'
2014-01-17 13:23:36 -07:00
Zixaphir
dc5daeba06
I really don't like iterating through objects.
2014-01-14 20:17:44 -07:00
Zixaphir
6195487460
Merge branch 'v3'
2014-01-13 19:10:17 -07:00
Zixaphir
6c1eef61c0
Fix "Mark Quotes of You"
...
God, that option name is dumb
2014-01-13 19:09:41 -07:00
Zixaphir
bd08bd964d
Merge branch 'json' into ajson
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Features/Index-navlinks.html
src/General/html/Monitoring/ThreadWatcher.html
src/Images/Gallery.coffee
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QR.coffee
2014-01-11 15:55:46 -07:00
Zixaphir
5785f9cda3
;__;
2014-01-08 11:57:54 -07:00
Zixaphir
bf89175d41
Merge branch 'json' -- this was safe and performance friendly, so.
...
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
2014-01-07 14:28:47 -07:00
Zixaphir
f067d990c6
Start work on more or less JSONing everything
...
Obviously to start, I want to make adding and removing callbacks
simpler, because I'm going to need to be disabling and enabling
features on the fly quite a lot, I'm guessing.
2014-01-07 13:37:14 -07:00
Zixaphir
996080cab9
Merge branch 'v3'
...
Conflicts:
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Menu/Menu.coffee
src/Posting/QR.coffee
2013-12-25 11:23:41 -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
ae789f4ad8
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Index.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/Posting/QuickReply.coffee
2013-12-24 16:18:47 -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
Zixaphir
1dfe5582c5
Fix #499 , trashcan icon
2013-12-16 18:53:12 -07:00
Zixaphir
6c47fb300a
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/crx/script.js
src/General/Header.coffee
2013-12-06 17:20:48 -07:00
Zixaphir
adaa09aaaa
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Fix some issues with previous merge.
Conflicts:
CHANGELOG.md
package.json
src/General/Header.coffee
src/Linkification/Linkify.coffee
2013-12-06 17:11:36 -07:00
Zixaphir
34140232fb
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/font-awesome.css
src/General/lib/notice.class
src/General/meta/metadata.js
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
worksforme.png
2013-11-23 12:56:42 -07: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
Zixaphir
904316e4e0
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
2013-10-13 14:42:58 -07:00
Zixaphir
91cedb3b89
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
html/General/Settings-section-Rice.html
img/changelog/3.9.0/0.png
package.json
src/Images/AutoGIF.coffee
src/Images/RevealSpoilers.coffee
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/IDColor.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteInline.coffee
src/Quotelinks/QuotePreview.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
2013-10-13 13:53:38 -07:00
Zixaphir
7812001d96
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/css/style.css
src/Posting/QuickReply.coffee
2013-09-24 14:46:24 -07:00
Jordan Bates
3470929e05
Merge some mayhem changes
2013-09-19 07:27:53 -07:00
Zixaphir
d4a3bc8a17
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Settings.coffee
src/General/css/font-awesome.css
src/Images/FappeTyme.coffee
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
ccc0335b79
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
css/style.css
html/Monitoring/ThreadWatcher.html
json/archives.json
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/img/favicons/empty.gif
src/Linkification/Linkify.coffee
src/Miscellaneous/ExpandComment.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
Zixaphir
3c0c478ded
Some touchups
2013-08-20 00:56:18 -07:00
seaweedchan
875f0cd4f8
Merge Zixaphir X
2013-08-12 00:07:39 -07:00
Zixaphir
8b01a46f30
I have a thing about these kinda things.
2013-08-07 01:54:29 -07:00
Zixaphir
0325539d43
Let's dig.
2013-08-07 00:21:26 -07:00
Zixaphir
cb30242ae8
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
src/General/Header.coffee
2013-08-05 14:37:23 -07:00
Zixaphir
f41a40c1ad
Forgot to add links to the post datatype
2013-08-04 19:47:07 -07:00
Zixaphir
dd4d979276
Still being different for the sake of being difficult
2013-07-24 22:01:48 -07:00
Zixaphir
0ac6747810
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
json/archives.json
src/General/Main.coffee
2013-07-24 21:55:26 -07:00
Zixaphir
582d067a10
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
Gruntfile.js
README.md
changelog-old
css/style.css
html/Monitoring/ThreadStats.html
html/Posting/QR.html
json/archives.json
package.json
src/Archive/Redirect.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Settings/Filter-guide.html
src/General/lib/$.coffee
src/General/lib/clone.class
src/General/lib/post.class
src/Images/ImageHover.coffee
src/Menu/Menu.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuotePreview.coffee
src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
