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 |
|
Zixaphir
|
a9ff7e8d7e
|
Fix Gallery menu-button
|
2014-02-16 04:40:35 -07:00 |
|
Mayhem
|
c685b0a5d6
|
Fix ImageExpand/Hover's error handling xhring the wrong URL.
|
2014-02-11 09:38:14 +01:00 |
|
Mayhem
|
bbf7abd6fa
|
Close #1433.
|
2014-02-08 18:19:37 +01:00 |
|
Mayhem
|
a234bdb2a5
|
Merge pull request #1412 from MayhemYDG/catalog
Drop support for the inline catalog
|
2014-02-05 18:03:40 +01:00 |
|
Mayhem
|
0675146d22
|
Add pin/hide/show thread menu entries for the catalog.
|
2014-02-04 13:51:21 +01:00 |
|
Mayhem
|
d6030f7df0
|
Set the catalog thumbnail via background image, save one element.
Also tiny fixes here and there.
|
2014-02-03 13:51:25 +01:00 |
|
Mayhem
|
1aa467b051
|
Remove all inline catalog-related code.
|
2014-01-29 16:25:52 +01:00 |
|
Mayhem
|
44e28961fd
|
Add Auto-GIF support in the catalog.
|
2014-01-29 15:22:46 +01:00 |
|
Mayhem
|
6dc91cfbdc
|
Add Image Hover support in the catalog.
Close #836
|
2014-01-29 15:01:29 +01:00 |
|
Zixaphir
|
9199f12ce0
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Images/Sauce.coffee
|
2014-01-28 01:14:01 -07:00 |
|
Zixaphir
|
2ac2286ad5
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
src/General/lib/$.coffee
src/Images/Sauce.coffee
|
2014-01-28 01:11:06 -07: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 |
|
ParrotParrot
|
0aaa9af8cc
|
changed to lowercase
|
2014-01-25 20:35:12 +01:00 |
|
ParrotParrot
|
dbd4de88b1
|
%NAME is indeed better
|
2014-01-25 20:31:27 +01:00 |
|
ParrotParrot
|
7a2faf861e
|
Added %FNAME case to link.replace switch
|
2014-01-25 20:10:40 +01:00 |
|
Zixaphir
|
b62d82bed0
|
Mayhem made responseType JSON default for any URL containing .json.
|
2014-01-24 14:48:39 -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 |
|