6172 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
Mayhem
db529cd125 Merge pull request #1489 from warosu/v3
warosu archives /g/
2014-02-28 20:12:38 +01:00
Haha Warosu
992848ae86 'files' means full images 2014-02-28 11:09:53 -08:00
Haha Warosu
d01aea0391 warosu archives /g/ 2014-02-28 11:03:41 -08:00
Kabir Sala
a817de9180 Remove moot ads, #15 2014-02-27 21:11:08 +01:00
Mayhem
59f2ca6a51 rm as many id attributes in posts as possible.
Add root.dataset.fullID, simplify Get.postFromRoot().
Also figured Menu.toggle() could be simplified since stub of threads do not exist anymore.
2014-02-27 19:02:32 +01:00
Mayhem
a853bd5e8e Make hiding threads on all threads index mode faster. #1484 2014-02-27 17:54:31 +01:00
Mayhem
2924711db4 Get rid of Index.nodes, -1 Get.threadFromRoot call. 2014-02-27 17:42:52 +01:00
Kabir Sala
66e1e23e6a Partially fix #19 2014-02-27 16:37:18 +01:00
Mayhem
5581281c2e Update deps. 2014-02-27 15:01:13 +01:00
Mayhem
da8001ba34 Merge pull request #1485 from woxxy/patch-1
Adding diy/sci to Foolz
2014-02-27 12:59:31 +01:00
Enzo Moretti
88db2d582c Adding diy/sci to Foolz 2014-02-27 10:37:35 +01:00
Mayhem
12ee5257f9 warosu archives /diy/ and /sci/. 2014-02-27 00:36:30 +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
Mayhem
fba0571efb rm dead code 2014-02-25 04:25:29 +01:00
Mayhem
4daab2b160 Remove the <hr> below settings nav.
It's not displayed in a flex container.
2014-02-25 01:02:00 +01:00
Mayhem
ac8e05dd22 Simplify import/export of settings.
Also clear all stored data before importing.
2014-02-24 23:56:30 +01:00
Kabir Sala
d0e2d1a583 Release 4chan X v1.4.0. 2014-02-24 23:41:08 +01:00
Kabir Sala
6fed2d3ab4 Update README 2014-02-24 23:40:03 +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
4adbe5a8d9 Release 1.4.0 2014-02-24 22:56:18 +01:00
Kabir Sala
fcb4742f0f I'll miss you, InstallGanoo 2014-02-24 22:01:13 +01:00
Kabir Sala
a5f58231b1 Fix the QR in the catalog 2014-02-24 22:00:04 +01:00
Mayhem
c6fc3428aa $.delete needs to take into account $.localKeys. 2014-02-24 21:48:35 +01:00
Mayhem
c3fd98551a Less <i>s. 2014-02-24 20:33:58 +01:00
Mayhem
5c6c0b7bd7 Use FontAwesome for the announcement hiding button. 2014-02-24 19:48:18 +01:00
Mayhem
e9929e5d5d Make the post hiding buttons the same color as the side arrows. 2014-02-24 18:55:24 +01:00
Kabir Sala
30c107315c Merge branch 'master' of github.com:Spittie/4chan-x 2014-02-24 17:29:00 +01:00
Kabir Sala
2d47870f51 Fix #12 2014-02-24 17:28:47 +01:00
Mayhem
397e936765 Wait for the pagelist to be replaced before removing .index-loading. 2014-02-24 15:27:00 +01:00
Mayhem
835f65623d Fix #1476. 2014-02-24 03:40:34 +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
Mayhem
ac9af09211 Merge pull request #1475 from GXTX/patch-1
installgentoo.net is no more.
2014-02-23 18:13:42 +01:00
Aaron (wutno)
bac22e4e5c installgentoo.net is no more.
See you space cowboy...
2014-02-23 12:12:51 -05: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
Mayhem
3f2aeff448 Fix #1473. 2014-02-23 02:08:51 +01:00
Mayhem
9816866889 Release 4chan X v3.19.0. 2014-02-22 14:51:58 +01:00
Mayhem
d9a1b2844e Merge pull request #1457 from MayhemYDG/hide
Hiding enhancements
2014-02-22 02:31:06 +01:00