Zixaphir
1229786aa5
Merge branch 'v3'
2014-05-03 07:09:44 -07:00
Zixaphir
541882103a
Fix backlinks
2014-05-03 07:05:28 -07:00
Zixaphir
c04c83f915
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Header.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/html/Features/Index-navlinks.html
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadStats.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Theming/Banner.coffee
2014-05-03 06:20:04 -07:00
Zixaphir
a1601d8825
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
package.json
src/General/Build.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/lib/post.class
src/Monitoring/ThreadStats.coffee
2014-05-03 02:45:58 -07:00
Zixaphir
523d6bd9c4
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
src/General/Build.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Navigate.coffee
src/General/css/style.css
src/General/html/Build/post.html
src/General/html/Features/Index-navlinks.html
src/General/lib/post.class
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
src/Miscellaneous/Banner.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/Quotify.coffee
2014-05-03 02:03:35 -07:00
ccd0
bf45917000
Merge branch 'newnames'
...
Conflicts:
src/General/lib/post.class
2014-04-19 16:57:17 -07:00
Zixaphir
d74834d406
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
2014-04-19 16:56:16 -07:00
Zixaphir
26f491a0cc
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
package.json
2014-04-19 16:54:50 -07:00
Zixaphir
41ec3933cd
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Navigate.coffee
src/Miscellaneous/Keybinds.coffee
src/Posting/QR.coffee
2014-04-19 15:48:11 -07:00
ccd0
ac3b09e385
small improvements to file info parsing
2014-04-19 11:24:09 -07:00
ccd0
a54957689a
better filename parsing; should fix conflict with Exlinks
2014-04-19 10:41:22 -07:00
ccd0
7aeb46abb9
transition to new HTML
2014-04-19 00:28:19 -07:00
ccd0
6c3a0619f6
remove src, thumb from image links
2014-04-12 21:57:40 -07:00
ccd0
c0ea6f8e95
update quote link regexp to accept /thread/
2014-04-12 21:28:31 -07:00
Zixaphir
33943a06eb
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
css/style.css
package.json
src/General/Build.coffee
src/General/Main.coffee
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
src/Monitoring/ThreadUpdater.coffee
2014-04-12 18:13:21 -07:00
Zixaphir
ea47aefd93
Merge branch 'v3'
...
Conflicts:
.gitignore
CHANGELOG.md
CONTRIBUTING.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Header.coffee
src/General/Index.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Settings/Settings.html
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/ThreadWatcher.coffee
2014-04-11 00:29:52 -07:00
Zixaphir
d9d2ceb9b1
Merge branch 'ccd0' into v3
...
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
src/General/Get.coffee
src/Images/Gallery.coffee
2014-04-07 18:35:18 -07:00
ccd0
deeba623a0
contract thumbnails in hover preview
...
... and don't clone the video element
2014-04-07 15:48:56 -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
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
