425 Commits

Author SHA1 Message Date
Mayhem
4860b59d1b Fix quoting on Firefox. 2014-02-22 00:17:22 +01:00
Mayhem
f456495160 Quoting now also includes the spoiler and code tags. 2014-02-21 17:45:39 +01:00
Kabir Sala
798b6dd7d2 ... 2014-02-20 23:54:18 +01:00
Kabir Sala
5916115cd8 Merge zix v3 2014-02-20 23:33:47 +01:00
Kabir Sala
a06862e858 Fix, I'm an idiot that doesn't understand scope, and can't even copy/paste from someone else 2014-02-20 21:32:04 +01:00
Zixaphir
67256bcf6d Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-20 12:58:05 -07:00
Zixaphir
87d3624442 Merge Mayhem's QR fix 2014-02-20 12:57:24 -07:00
Kabir Sala
3986298f4f Copy fix from Mayhem, hopefully I didn't break anything 2014-02-20 20:56:49 +01:00
Mayhem
cbf60059b8 Fix the QR. 2014-02-20 20:29:11 +01:00
Kabir Sala
3a1e1426af silly kate 2014-02-18 16:11:33 +01:00
Kabir Sala
fb7328ce82 Update builds 2014-02-18 16:10:42 +01:00
Kabir Sala
a9460f0513 Fix Chrome 2014-02-17 18:53:30 +01: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
Zixaphir
6dd0cac797 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
2014-02-16 01:00:41 -07:00
Kabir Sala
af2589d0e2 Fixes, better code(?) 2014-02-13 18:28:09 +01:00
Kabir Sala
cff413769e cleanup 2014-02-12 23:56:30 +01:00
Kabir Sala
fe4b037536 More fixes 2014-02-12 23:30:49 +01:00
Kabir Sala
a439ecf4f2 Add filename 2014-02-12 05:15:17 +01:00
Kabir Sala
15d8da033a Fix posting from url in Firefox 2014-02-12 03:22:13 +01:00
Kabir Sala
eeb95bbb9f fix 2014-02-12 00:22:00 +01:00
Kabir Sala
d8a168a549 More work on post from url 2014-02-11 23:37:52 +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
Mayhem
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog
Drop support for the inline catalog
2014-02-05 18:03:40 +01:00
Mayhem
e062f1626f Remove Cooldown Prediction. 2014-02-05 09:32:01 +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
3887e184b8 Close #1416 2014-02-02 17:45:29 +01:00
Mayhem
c5490f6aec Fix cooldowns never expiring. 2014-02-01 15:41:36 +01:00
Mayhem
f080a15292 Merge branch 'v3' into catalog 2014-02-01 00:32:17 +01:00
Mayhem
2082e46cc5 typo
tee hee #1342
2014-02-01 00:01:17 +01:00
Mayhem
dac4ccbead Hide the persistent QR in the catalog. 2014-01-31 23:30:54 +01:00
Mayhem
c1e76c8805 Update deps. 2014-01-29 23:45:55 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
5a5658bc60 Fix #557, Fix #554 2014-01-28 01:51:24 -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
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
Zixaphir
f37484cd33 HTTPS for posting, always. 2014-01-19 16:20:21 -07:00
Zixaphir
a993b440dc Try to get some better errors out of QR.req.onerror
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/layout.css
2014-01-19 16:19:18 -07:00
Zixaphir
c94820e184 HTTPS for posting, always. 2014-01-19 15:25:22 -07:00