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 |
|
Zixaphir
|
1de6c29a51
|
Fix captcha (again)
|
2014-03-06 21:38:31 -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 |
|
Zixaphir
|
979650f745
|
Merge branch 'master' of github.com:zixaphir/appchan-x
Conflicts:
src/Posting/QR.captcha.coffee
|
2014-02-16 02:22:48 -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
|
af2589d0e2
|
Fixes, better code(?)
|
2014-02-13 18:28:09 +01:00 |
|
Kabir Sala
|
f0bd6b1b04
|
Start working on remote upload (Chrome-only so far)
|
2014-02-11 18:32:23 +01:00 |
|
Spittie
|
17f97786f8
|
Fix tabbing into the captcha
It (should) just work.
|
2014-02-10 20:45:28 +01:00 |
|
Kabir Sala
|
9c5ca585ed
|
Add setting to load captcha when you open the thread, disabled by default
|
2014-02-10 15:22:56 +01:00 |
|
Mayhem
|
130462f3f9
|
Minor captcha fix.
|
2014-02-10 09:04:30 +01:00 |
|
Kabir Sala
|
a7b2565e5b
|
Copy more from Zixaphir and Mayhem, proper(?) fix for Chrome
|
2014-02-10 04:45:04 +01:00 |
|
Zixaphir
|
762e733896
|
Lazy-merge Mayhem's captcha fixes
now back to skyrim.
|
2014-02-09 18:13:15 -07:00 |
|
Kabir Sala
|
6c2579449a
|
Release 4chan X v1.3.4.
|
2014-02-10 01:57:43 +01:00 |
|
Kabir Sala
|
b368b0bbb4
|
Mayhem: Minor captcha fix.
|
2014-02-10 01:14:10 +01:00 |
|
Kabir Sala
|
1b6052304b
|
Stuff
|
2014-02-09 21:43:31 +01:00 |
|
Mayhem
|
6b3495fb77
|
Minor captcha fix.
|
2014-02-09 19:46:44 +01:00 |
|
Kabir Sala
|
3bd506e617
|
Copy Mayhem
|
2014-02-09 19:36:28 +01:00 |
|
Mayhem
|
26954b6755
|
Fix captcha
|
2014-02-09 19:08:09 +01:00 |
|
Zixaphir
|
0f1ab5c5a5
|
Finally make the Captcha Filter into an option
I'm fairly certain I've "fixed" the invisible captcha issue, but
for whatever reason, someone might just not want a filter.
|
2014-01-12 13:56:11 -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
|
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 |
|