Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,306 Commits 2 Branches 0 Tags
Commit Graph

489 Commits

Author SHA1 Message Date
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
Kabir Sala
3362e3a436 Release 4chan X v1.4.1. 2014-03-01 18:53:03 +01:00
Kabir Sala
387ebcad4f Update archives 2014-03-01 04:40:45 +01:00
Kabir Sala
e72026cc95 Better #16 2014-02-28 20:06:27 +01:00
Kabir Sala
66e1e23e6a Partially fix #19 2014-02-27 16:37:18 +01:00
Kabir Sala
9a4199d829 Fix #14 2014-02-25 13:20:19 +01:00
Kabir Sala
180844b376 Merge 2014-02-24 23:35:11 +01:00
Kabir Sala
a5f58231b1 Fix the QR in the catalog 2014-02-24 22:00:04 +01:00
Kabir Sala
2d47870f51 Fix #12 2014-02-24 17:28:47 +01:00
Zixaphir
56ed876be8 Merge branch 'master' of git://github.com/vampiricwulf/appchan-x 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-02-23 08:05:27 -07:00
Kabir Sala
fa024c3044 update builds 2014-02-21 00:02:36 +01:00
Kabir Sala
2056fc85f2 update builds 2014-02-21 00:00:57 +01:00
Kabir Sala
8a8f14d7ce ... 2014-02-20 23:54:27 +01:00
Kabir Sala
5916115cd8 Merge zix v3 2014-02-20 23:33:47 +01:00
Kabir Sala
6d1ec737d7 Bump everything 2014-02-20 21:00:06 +01:00
Zixaphir
b30276eee3 Release appchan x v2.8.13. 2014-02-20 12:58:45 -07:00
Zixaphir
87d3624442 Merge Mayhem's QR fix 2014-02-20 12:57:24 -07:00
Zixaphir
31a444e319 Quick CSS fixes 2014-02-20 12:55:26 -07:00
Zixaphir
f1cf2a7828 Get rid of excess space in vertical icons orientation 2014-02-18 10:03:33 -07:00
Kabir Sala
fb7328ce82 Update builds 2014-02-18 16:10:42 +01:00
Brandon
785bc4297c /f/ embed and navLinks 2014-02-17 15:03:56 -08:00
Kabir Sala
516fdb902b Update archives 2014-02-17 18:54:52 +01:00
Zixaphir
1aeee61fcd Release appchan x v2.8.12. 2014-02-17 08:29:17 -07:00
Zixaphir
0d7668472f Fix #586 2014-02-17 07:33:32 -07:00
Zixaphir
0b65c2af56 Release appchan x v2.8.11. 2014-02-16 05:58:51 -07:00
Zixaphir
5628c117fc Release appchan x v2.8.10. 2014-02-16 05:50:58 -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
531ebd9cce Update builds 2014-02-15 22:53:31 +01:00
Kabir Sala
017502e0dd Twitter embedding 2014-02-15 22:26:12 +01:00
Kabir Sala
e082c4336d Update .crx 2014-02-13 18:37:20 +01:00
Kabir Sala
af2589d0e2 Fixes, better code(?) 2014-02-13 18:28:09 +01:00
Kabir Sala
15d8da033a Fix posting from url in Firefox 2014-02-12 03:22:13 +01:00
Kabir Sala
f0bd6b1b04 Start working on remote upload (Chrome-only so far) 2014-02-11 18:32:23 +01:00
Kabir Sala
feedeaaec1 Update crx 2014-02-10 15:48:42 +01:00
Zixaphir
a9de36ca63 Release appchan x v2.8.9. 2014-02-09 18:14:13 -07: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
1b6052304b Stuff 2014-02-09 21:43:31 +01:00
Kabir Sala
3bd506e617 Copy Mayhem 2014-02-09 19:36:28 +01:00
Zixaphir
5578c4c0f0 Release appchan x v2.8.8. 2014-01-30 14:21:19 -07: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
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
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
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
8ad63f968a Release appchan x v2.8.7. 2014-01-19 15:29:48 -07:00