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

974 Commits

Author SHA1 Message Date
Zixaphir
db5cccc70f Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;) 
Conflicts:
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Settings-section-Main.html
	html/General/Settings.html
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadUpdater.coffee
 2014-02-28 19:59:04 -07:00
Zixaphir
553a5a9133 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/General/Index.coffee
	src/Posting/QR.coffee
 2014-02-28 19:37:26 -07:00
Zixaphir
0d7f5ab78c Lets use our "dialog" class for shit we don't need to fuck around with 2014-02-28 19:22:38 -07:00
Zixaphir
6c4e97b388 Restore CSS I accidentally deleted 
This is Seaweed's stuff, and he kinda-sorta originally wrote the
stylesheets for a lot of these styles for 4chan (not 4chan X)
so it's probably best we leave them to his vision.
 2014-02-28 19:12:13 -07:00
Zixaphir
811e3ccaf3 Use our implementation of Navigating between boards 
Our custom navigation should now behave similar to Mayhem's, but
with JSON.
 2014-02-28 18:56:02 -07:00
Zixaphir
5a76a9109c Cache boards.json 2014-02-28 18:29:52 -07:00
Zixaphir
b4d28414df Fix OPs being built twice 2014-02-28 16:27:54 -07:00
Zixaphir
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07:00
Kabir Sala
a817de9180 Remove moot ads, #15 2014-02-27 21:11:08 +01:00
Kabir Sala
66e1e23e6a Partially fix #19 2014-02-27 16:37:18 +01:00
Kabir Sala
903ebad815 Respect Auto Hide QR in the catalog 2014-02-25 13:25:59 +01:00
Kabir Sala
9a4199d829 Fix #14 2014-02-25 13:20:19 +01:00
Kabir Sala
d0e2d1a583 Release 4chan X v1.4.0. 2014-02-24 23:41:08 +01:00
Kabir Sala
f4e0758bbb Update builds 2014-02-24 23:39:13 +01:00
Kabir Sala
78c8bce7c2 Update builds 2014-02-24 23:38:57 +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
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
6884039627 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/Posting/QR.coffee
 2014-02-23 08:49:32 -07:00
Zixaphir
58a3adeedb Small CustomCSS optimization 2014-02-23 08:33:31 -07:00
Zixaphir
8fa130c2df Backport @vampiricwulf's flash features 2014-02-23 08:32:06 -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
8b38aaea1a Bump version, update builds 2014-02-20 21:35:50 +01:00
Kabir Sala
6d1ec737d7 Bump everything 2014-02-20 21:00:06 +01:00
Zixaphir
87d3624442 Merge Mayhem's QR fix 2014-02-20 12:57:24 -07:00
Kabir Sala
fb7328ce82 Update builds 2014-02-18 16:10:42 +01:00
Kabir Sala
516fdb902b Update archives 2014-02-17 18:54:52 +01:00
Kabir Sala
5b9b7e3802 Handle edge cases, aka why name is not a separate header 2014-02-17 01:21:02 +01:00
Zixaphir
6649e8519c Fix unread count + thread updater with quote threading enabled 
See guys, fix one thing, break another!
 2014-02-16 03:15:23 -07:00
Zixaphir
b3f937f5c8 Fix JSON Navigation unread count 2014-02-16 03:11:27 -07:00
Zixaphir
32b020c701 Fix titlelink. 2014-02-16 02:27:26 -07:00
Zixaphir
6536d5a2b3 Yeah, let's start the day with obviously erroneous code! 2014-02-16 01:07:32 -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
530b4bedba Update builds 2014-02-15 22:51:45 +01:00
Kabir Sala
471cf4f2f7 Add Firefox XPI 2014-02-15 22:46:50 +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
cff413769e cleanup 2014-02-12 23:56:30 +01:00
Kabir Sala
6fe203bcc9 Add gfycat.com embedding 2014-02-12 23:43:01 +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
14f667fd7a Update crx 2014-02-11 23:39:39 +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