Zixaphir
4b28626410
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
src/Images/ImageHover.coffee
src/Posting/QR.coffee
2014-04-04 16:10:07 -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
07d5b9eeb8
global sound option
2014-04-04 15:35:16 -07:00
Mayhem
0bc93400c1
.webm #1533
2014-04-05 00:32:44 +02:00
ccd0
26576b4420
video hover
2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a
add video expansion
2014-04-04 11:56:10 -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
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
Mayhem
498dfda2ef
Update code related to hidden threads.
2014-02-22 00:17:48 +01:00
Mayhem
c685b0a5d6
Fix ImageExpand/Hover's error handling xhring the wrong URL.
2014-02-11 09:38:14 +01:00
Mayhem
1aa467b051
Remove all inline catalog-related code.
2014-01-29 16:25:52 +01:00
Zixaphir
1f49ef2212
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Settings/Settings.html
src/Miscellaneous/AnnouncementHiding.coffee
2014-01-26 11:40:50 -07: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
Mayhem
1eaf43e39a
Fetch the image's HEAD status to see if it's still available or not.
...
Chrome bypasses the lack of CORS because we've allowed `i.4cdn.org` in the manifest.
2014-01-22 16:52:46 +01:00
Zixaphir
f301f1c2c2
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
2014-01-21 13:59:05 -07:00
Zixaphir
702a343f5e
Fix image expansion
...
DURR
2014-01-21 13:57:28 -07:00
Mayhem
710655f13e
Use xhr.responseType = 'json'.
2014-01-21 14:46:26 +01: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
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
6dd2e60e9a
Element.contains was not Array.contains, lol
2013-12-25 10:10:51 -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
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
Mayhem
985afb2a1a
Support 4cdn.
2013-11-21 23:11:02 +01:00
Mayhem
6975a766b9
Update font-awesome.
2013-11-07 22:34:41 +01:00
Mayhem
81a2b096a1
Introduce Header.{scrollToIfNeeded,getTopOf,getBottomOf}() and use them.
...
4chan X - now with proper bottom header support.
2013-11-03 01:27:23 +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
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
Mayhem
10e93091d7
{Post,Thread}::callbacks => {Post,Thread}.callbacks
2013-10-02 11:38:15 +02:00
Zixaphir
2efd32a0a6
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/css/style.css
2013-08-30 19:35:10 -07:00
Zixaphir
47bdc73f4c
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
css/style.css
src/Images/ImageExpand.coffee
src/Linkification/Linkify.coffee
src/Monitoring/ThreadUpdater.coffee
2013-08-30 18:15:47 -07:00
Mayhem
455778f865
Fix image contraction not always moving us back to the post.
2013-08-28 20:32:58 +02: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
8c1ac1710a
Gallery stuff.
2013-08-23 14:37:20 -07:00
Zixaphir
e80797a0fb
Separate icons and "stats" in the shortcuts element
2013-08-21 11:26:48 -07:00
Zixaphir
7d626b9cb8
Get "slideout" UI working.
2013-08-20 00:20:29 -07:00
Zixaphir
1facbe7dc1
Get Flex actually working
2013-08-19 09:06:31 -07:00
Jordan Bates
0442192181
Release 4chan X v1.2.34.
2013-08-19 07:38:57 -07:00
Zixaphir
a730a0bc17
Start IconPositioner rewrite
2013-08-19 02:21:51 -07:00
Zixaphir
72e3fc2585
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Features/QuickReply.html
src/General/img/favicons/xat-/unreadDead.png
src/General/img/favicons/xat-/unreadDeadY.png
src/General/img/favicons/xat-/unreadNSFW.png
src/General/img/favicons/xat-/unreadNSFWY.png
src/General/img/favicons/xat-/unreadSFW.png
src/General/img/favicons/xat-/unreadSFWY.png
src/General/meta/banner.js
src/General/meta/metadata.js
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
Zixaphir
ce78a9d403
We're just going to use the CSS we want, not the CSS provided.
2013-08-18 04:06:39 -07:00
seaweedchan
1fb2897baa
Some shortcut icon tweaks
2013-08-18 03:42:25 -07:00
Zixaphir
ec32e54ef5
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
css/style.css
src/General/Config.coffee
src/General/meta/manifest.json
src/Posting/QuickReply.coffee
2013-08-17 21:00:31 -07:00
Zixaphir
d15f8ee728
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
css/style.css
html/Posting/QR.html
img/changelog/3.2.0/0.png
package.json
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Notice.coffee
src/General/Notification.coffee
src/General/Settings.coffee
src/General/img/icon.gif
src/General/lib/notification.class
src/Monitoring/Favicon.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07:00
Mayhem
dd8748fbfb
Fix #1243 .
2013-08-18 00:15:50 +02:00
