Zixaphir
|
409f1f9ecf
|
Finishing up merge, onto testing...
|
2015-01-09 23:51:32 -07:00 |
|
Zixaphir
|
e4dde07c11
|
The rest of the QR
|
2015-01-09 23:31:22 -07:00 |
|
Zixaphir
|
2aa77d2207
|
This shouldn't have worked.
|
2014-12-12 03:14:14 -07:00 |
|
Zixaphir
|
168aa98096
|
Merge @ccd0's capcha changes up to ccd0/4chan-x@bb806b453
|
2014-12-12 03:03:27 -07:00 |
|
Zixaphir
|
89cb5a6b6b
|
Merge Recaptcha v2 changes from ccd0/4chan-x
|
2014-12-08 22:55:49 -07:00 |
|
Zixaphir
|
64c9c139c1
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Archive/archives.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Settings.coffee
src/Images/FappeTyme.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
|
2014-06-22 07:13:41 -07:00 |
|
Zixaphir
|
f103fd0301
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
package.json
src/Archive/archives.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.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.post.coffee
|
2014-06-22 07:04:25 -07:00 |
|
Mayhem
|
41c22af15f
|
GM2 incoming!
|
2014-06-19 04:34:37 +02:00 |
|
Zixaphir
|
2efa358131
|
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/CatalogLinks.coffee
src/Posting/QR.coffee
|
2014-05-27 12:39:01 -07:00 |
|
Zixaphir
|
741081fc27
|
Unnecessary.
|
2014-05-11 17:54:49 -07:00 |
|
Zixaphir
|
1d13bffa7c
|
This should fix any problems caused by the checkDimensions refactor
|
2014-05-11 17:52:47 -07:00 |
|
Zixaphir
|
37a3b05e39
|
Merge branch 'ccd0' into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
package.json
src/Archive/archives.json
src/General/Get.coffee
src/General/Navigate.coffee
src/Images/Gallery.coffee
src/Linkification/Linkify.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
|
2014-05-11 16:04:14 -07:00 |
|
ccd0
|
454b073f87
|
reuse dimension check image/video elements for thumbnail maker
|
2014-05-06 03:35:35 -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
|
0fdeae4e77
|
Consolidate dimension-check code into QR.post.
Reduces redundant generation of video/image elements for thumbnail
generation and dimension check code by merging them into one routine
|
2014-05-03 06:05:28 -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
|
a24086828c
|
generate QR thumbnails for .webm
|
2014-04-28 23:58:25 -07:00 |
|
ccd0
|
a122981aa9
|
Revert "Fix captchas, again. #1531"
This reverts commit fd703d42bad855d9e103ecbdb2628fcef94b9651.
Conflicts:
CHANGELOG.md
|
2014-04-27 18:28:50 -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 |
|
Mayhem
|
9215c06d55
|
Fix webm upload. #1533
|
2014-04-06 15:46:02 +02:00 |
|
ccd0
|
b3f5011bcf
|
Revert "I like that better"
This reverts commit 2ba7ae5d280c7f5c8c0ef803f99fcdd0606e7270.
|
2014-04-06 01:05:37 -07:00 |
|
Zixaphir
|
6760dcf09f
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
|
2014-04-05 01:03:36 -07:00 |
|
Zixaphir
|
2ba7ae5d28
|
I like that better
|
2014-04-05 00:58:57 -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 |
|
ccd0
|
9ca9360ffd
|
add WebM to supported posting types, bypass width/height check for now
|
2014-04-04 15:30:21 -07:00 |
|
Mayhem
|
fd703d42ba
|
Fix captchas, again. #1531
Conflicts:
CHANGELOG.md
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
|
2014-04-02 17:51:14 -07:00 |
|
Zixaphir
|
9f7026e419
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Posting/QR.captcha.coffee
|
2014-04-02 17:21:16 -07:00 |
|
Zixaphir
|
8f62341949
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
package.json
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
|
2014-04-02 17:12:15 -07:00 |
|
Mayhem
|
7bc7aed998
|
Fix captchas, again. #1531
|
2014-04-03 01:47:38 +02: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 |
|
Zixaphir
|
d11b435134
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/icon16.png
builds/crx/icon48.png
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/html/Features/QuickReply.html
src/General/img/icon16.png
src/General/img/icon48.png
src/Miscellaneous/Emoji.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
|
2014-02-16 02:17:36 -07:00 |
|
Kabir Sala
|
cff413769e
|
cleanup
|
2014-02-12 23:56:30 +01:00 |
|
Kabir Sala
|
d8a168a549
|
More work on post from url
|
2014-02-11 23:37:52 +01:00 |
|
Mayhem
|
5a29b74581
|
Fix title not being set on post previews in the QR when adding multiple files.
|
2014-02-05 09:22:30 +01:00 |
|
Mayhem
|
c1e76c8805
|
Update deps.
|
2014-01-29 23:45:55 +01: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 |
|
Mayhem
|
a646d532b2
|
Split QR.coffee into multiple files.
|
2013-12-19 04:34:37 +01:00 |
|