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 |
|
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 |
|
Mayhem
|
c7b7795261
|
Start supporting new semantics.
|
2014-04-12 18:01:03 +02: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
|
a4b9c303ab
|
Don't leave an extra > when quoting.
|
2014-04-10 15:34:52 +02:00 |
|
Zixaphir
|
d215221c71
|
Merge branch 'ccd0' into v3
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
src/General/Build.coffee
src/Miscellaneous/ExpandThread.coffee
|
2014-04-07 11:26:21 -07:00 |
|
ccd0
|
f9086ecc95
|
remove unneeded call
|
2014-04-06 22:56:52 -07:00 |
|
Zixaphir
|
382c4f8f3c
|
Fix "post from URL"
|
2014-04-06 20:40:54 -07:00 |
|
Zixaphir
|
5317db355d
|
Handle captcha errors with a new captcha!
|
2014-04-06 15:58:59 -07:00 |
|
Zixaphir
|
29a26680a1
|
Reload captcha if there are posts in the queue.
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-06 15:58:41 -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 |
|
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
|
e5230e6457
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
|
2014-04-05 05:39:32 -07:00 |
|
Zixaphir
|
22d7295217
|
I'm having a bad morning.
|
2014-04-05 05:39:01 -07:00 |
|
Zixaphir
|
eb91edaf6d
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
|
2014-04-05 05:33:14 -07:00 |
|
Zixaphir
|
813ebd3039
|
Fix file input
|
2014-04-05 05:32:13 -07:00 |
|
Mayhem
|
12b6fee222
|
Changelog.
|
2014-04-05 14:07:50 +02:00 |
|
Mayhem
|
9ee39b3908
|
Re-setup the QR captcha when necessary. Fix #1534
|
2014-04-05 13:45:34 +02: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
|
df78c2e1f8
|
Handle captcha errors with a new captcha!
|
2014-04-05 01:02:43 -07:00 |
|
Zixaphir
|
2ba7ae5d28
|
I like that better
|
2014-04-05 00:58:57 -07:00 |
|
Zixaphir
|
af843c0c6d
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
|
2014-04-05 00:47:29 -07:00 |
|
Zixaphir
|
4d8e4b62da
|
Reload captcha if there are posts in the queue.
|
2014-04-05 00:46:16 -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
|
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 |
|
Mayhem
|
0bc93400c1
|
.webm #1533
|
2014-04-05 00:32:44 +02:00 |
|
ccd0
|
9ca9360ffd
|
add WebM to supported posting types, bypass width/height check for now
|
2014-04-04 15:30:21 -07:00 |
|
Zixaphir
|
b662cf2366
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/css/style.css
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
|
2014-04-03 15:19:41 -07:00 |
|
Zixaphir
|
27b745ce7d
|
Smart
|
2014-04-03 15:06:48 -07:00 |
|
Zixaphir
|
6df7f1c4da
|
Small flags input reflow
|
2014-04-03 15:05:36 -07:00 |
|
Zixaphir
|
4756274a73
|
Merge branch 'ccd0' into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
src/Posting/QR.coffee
|
2014-04-03 14:58:07 -07:00 |
|
Zixaphir
|
46478eb4d0
|
Merge branch 'duckness' into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Linkification/Linkify.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
|
2014-04-03 14:52:55 -07:00 |
|
ccd0
|
b2787128e1
|
fix flag input field removal
|
2014-04-03 12:10:32 -07:00 |
|
ccd0
|
d943bf5024
|
fix navigation bug
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-03 05:15:22 -07:00 |
|
ccd0
|
6780ef629d
|
fix navigation bug
|
2014-04-03 04:55:31 -07:00 |
|
ccd0
|
bf6e918d0d
|
Release 4chan X v1.4.2.
|
2014-04-02 21:47:46 -07:00 |
|
Zixaphir
|
1f9d5e2221
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
|
2014-04-02 19:17:49 -07:00 |
|
Brandon
|
9c11798308
|
move that where it belongs
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-02 19:17:19 -07:00 |
|
Brandon
|
0d34429ee0
|
fix uploading swfs on /f/
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
|
2014-04-02 19:16:51 -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 |
|
Bjorn Lim
|
2b16fa924f
|
Update QR.captcha.coffee
added changes from MayhemYDG to solve captcha issue
|
2014-03-29 18:18:51 +08:00 |
|
Zixaphir
|
df2a5f3fc0
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
|
2014-03-27 13:55:02 -07:00 |
|
Zixaphir
|
cefb710c04
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
css/style.css
package.json
src/General/Header.coffee
|
2014-03-27 13:50:02 -07:00 |
|
Mayhem
|
825236a002
|
Fix #1524.
|
2014-03-27 21:31:16 +01:00 |
|