Zixaphir
|
e286c247ea
|
Merge branch 'ccd0' into v3
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
src/Images/ImageExpand.coffee
|
2014-04-06 22:45:30 -07:00 |
|
Zixaphir
|
13605179cd
|
WebM Gallery Mode.
|
2014-04-06 22:40:16 -07:00 |
|
ccd0
|
ddf202397c
|
Allow drag left even when controls are off
Will be helpful if someone activates controls by right-clicking.
|
2014-04-06 21:54:20 -07:00 |
|
ccd0
|
98514dd986
|
this should get width fitting working again
hopefully it doesn't break anything else
|
2014-04-06 21:38:44 -07:00 |
|
Zixaphir
|
68a76a25f2
|
Merge branch 'ccd0' into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx.crx
builds/crx/manifest.json
builds/crx/script.js
builds/updates.xml
latest.js
package.json
src/General/UI.coffee
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
|
2014-04-06 20:47:38 -07:00 |
|
ccd0
|
5361e39337
|
fix here too
|
2014-04-06 19:58:42 -07:00 |
|
ccd0
|
53f6aac3d7
|
fix brainfart
|
2014-04-06 19:45:57 -07:00 |
|
ccd0
|
5f95bf3e3c
|
using el.videoHeight here does help
The whole thing appears to be a hack, though;
we should really be using the image dimensions
from the file info.
|
2014-04-06 19:17:58 -07:00 |
|
ccd0
|
81f1dbf0fb
|
work around FF forever-loading bug, other tweaks
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-06 16:09:09 -07:00 |
|
ccd0
|
49d76b4177
|
fix video controls
|
2014-04-06 16:07:18 -07:00 |
|
ccd0
|
52949b545e
|
fix hover/expand so it works when switching between catalog/paged modes
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-06 16:06:55 -07:00 |
|
ccd0
|
0f770459c0
|
get new hover working in catalog
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
src/General/UI.coffee
src/Images/ImageHover.coffee
|
2014-04-06 16:06:11 -07:00 |
|
ccd0
|
74ef633fd7
|
better approach to hover css
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-06 16:04:36 -07:00 |
|
ccd0
|
113dde4eae
|
remove listeners on contract
|
2014-04-06 16:03:47 -07:00 |
|
Zixaphir
|
7818dec073
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
package.json
src/General/Index.coffee
src/Images/ImageHover.coffee
|
2014-04-06 11:49:45 -07:00 |
|
ccd0
|
d32b923ac5
|
work around FF forever-loading bug, other tweaks
|
2014-04-06 09:58:34 -07:00 |
|
ccd0
|
536abebe1f
|
fix video controls
|
2014-04-06 08:36:31 -07:00 |
|
ccd0
|
938479ea09
|
fix hover/expand so it works when switching between catalog/paged modes
|
2014-04-06 02:49:38 -07:00 |
|
ccd0
|
e1c9330250
|
get new hover working in catalog
|
2014-04-05 21:59:29 -07:00 |
|
ccd0
|
904af13063
|
better approach to hover css
|
2014-04-05 20:11:38 -07:00 |
|
ccd0
|
2a3f7ecd54
|
remove listeners on contract
|
2014-04-05 19:53:26 -07:00 |
|
ccd0
|
782fd7ad05
|
Merge branch 'v3' of https://github.com/zixaphir/appchan-x
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
|
2014-04-05 18:21:07 -07:00 |
|
ccd0
|
dcda06c40c
|
Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-05 17:36:35 -07:00 |
|
Mayhem
|
62321ecb18
|
Fix #1537
|
2014-04-05 13:53:52 +02:00 |
|
ccd0
|
342672bab3
|
implement length 1 queue of videos to be deleted
|
2014-04-04 22:11:17 -07:00 |
|
Zixaphir
|
ef886aea7f
|
Merge fail.
|
2014-04-04 20:50:30 -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
|
4a26b5ea14
|
Firefox doesn't seem to like displaying videos as blocks?
|
2014-04-04 17:28:44 -07:00 |
|
Zixaphir
|
66f449cced
|
Cleanup
|
2014-04-04 17:11:41 -07:00 |
|
Zixaphir
|
f6898b8c03
|
Change some things around
|
2014-04-04 17:05:53 -07:00 |
|
Zixaphir
|
8536ae3d37
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
builds/updates.xml
latest.js
package.json
|
2014-04-04 16:12:31 -07:00 |
|
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
|
e499adf735
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
|
2014-03-15 15:37:03 -07:00 |
|
Zixaphir
|
af87eea3fb
|
waddafuck
|
2014-03-15 15:35:50 -07:00 |
|
Zixaphir
|
fd80574fc3
|
Merge branch 'v3'
|
2014-03-11 15:23:03 -07:00 |
|
Zixaphir
|
0dd77eb92c
|
Fix "Reveal Spoiler Thumbnails" option
|
2014-03-11 15:22:46 -07:00 |
|
Zixaphir
|
7301f43289
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/General/css/yotsuba-b.css
src/Images/FappeTyme.coffee
|
2014-03-06 23:07:49 -07:00 |
|
Zixaphir
|
c7e5833dc9
|
Remove more references to the non-existent "catalog" view
|
2014-03-06 22:36:42 -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
|
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
|
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 |
|
Brandon
|
f7a3044409
|
Fix /f/ FappeTyme
|
2014-02-17 15:08:11 -08:00 |
|