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

143 Commits

Author SHA1 Message Date
Zixaphir
b00390b980 Merge branch 'ccd0' into v3 
Rebase ImageExpand implemention off ccd0's

Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/Images/ImageExpand.coffee
 2014-04-08 14:46:15 -07:00
ccd0
be50e4b1f4 add 'Expand videos' setting 2014-04-07 21:17:19 -07:00
Zixaphir
d2727c4054 Implement webm thumbnail replacement. 2014-04-07 10:33:52 -07:00
Zixaphir
68a76a25f2 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
	src/General/UI.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-06 20:47:38 -07:00
ccd0
b2f4a8daf0 turn JSON navigation off by default 2014-04-06 19:21:23 -07:00
ccd0
47eea2a57a implement duckness's upgrade nag disabling option 2014-04-06 16:10:05 -07:00
ccd0
31eac580aa implement duckness's upgrade nag disabling option 2014-04-06 10:17:26 -07:00
Zixaphir
4b28626410 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageHover.coffee
	src/Posting/QR.coffee
 2014-04-04 16:10:07 -07:00
Zixaphir
e4c395a7cd Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
 2014-04-04 15:41:15 -07:00
ccd0
07d5b9eeb8 global sound option 2014-04-04 15:35:16 -07:00
ccd0
26576b4420 video hover 2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a add video expansion 2014-04-04 11:56:10 -07:00
Zixaphir
4756274a73 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Posting/QR.coffee
 2014-04-03 14:58:07 -07:00
ccd0
bf6e918d0d Release 4chan X v1.4.2. 2014-04-02 21:47:46 -07:00
Zixaphir
9b9a2980aa Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	README.md
	css/style.css
	html/General/Header.html
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
 2014-03-13 14:30:39 -07:00
Zixaphir
0e68fe013f Separate Quote Markers into options again. 
Still better than it was in terms of code, tho
 2014-03-10 08:55:14 -07:00
Mayhem
06da6b0c9e Nuke Announcement Hiding setting. 2014-03-10 09:17:33 +01:00
Zixaphir
f96e046af4 Change the index mod keybinds. 
These ones are probably even more dumb, though.
 2014-03-09 15:43:30 -07:00
Zixaphir
698ef0fa05 Fix post hiding menu entries 2014-03-09 15:32:11 -07:00
Mayhem
9127179e0d Nuke the Enable 4chan's Extension setting. 2014-03-07 04:23:01 +01: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
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
498dfda2ef Update code related to hidden threads. 2014-02-22 00:17:48 +01:00
Mayhem
0ea3c733a4 Hide threads like we hide them in the catalog. 2014-02-22 00:17:48 +01:00
Mayhem
61510ca272 Add {Post,Thread}::{hide,show}(). Merge reply hiding and thread hiding. 2014-02-22 00:17:47 +01: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
Mayhem
216f7c3abb rm Clean Links config. 2014-02-15 00:51:47 +01:00
Mayhem
740e408798 Add Open threads in a new tab setting. 2014-02-13 15:43:15 +01:00
ahodesuka
c97112d0ee Change ordering to be the same as the dropdown. 2014-02-12 02:21:08 -06:00
ahodesuka
1c47e1c197 Remove unneeded parentheses, change default keybindings, remove unneeded slice and filter. 2014-02-12 02:09:02 -06:00
ahodesuka
165fad8623 Add hotkeys for index modes. 2014-02-12 00:11:29 -06:00
Mayhem
ab739fd446 Add keybind to cycle through index sort types. 2014-02-11 10:13:53 +01:00
Mayhem
871cdfe0c9 Add Image Size. 2014-02-11 09:23:39 +01:00
Kabir Sala
630396f638 Revert "Disabled Quote Threading by default, >>>/reddit/" 
This reverts commit a087fe8fc85a6f2e797336a1f7c8777a41e07c69.
 2014-02-10 15:33:27 +01:00
Kabir Sala
a087fe8fc8 Disabled Quote Threading by default, >>>/reddit/ 2014-02-10 15:26:15 +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
bbf7abd6fa Close #1433. 2014-02-08 18:19:37 +01:00
Mayhem
f6f1126130 Quote markers. 2014-02-08 18:05:33 +01:00
Mayhem
67aafb4ec5 Return to the previous index mode that's not the catalog. 2014-02-07 22:40:32 +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
cc4121070a Add Threads per Page setting. 2014-02-05 15:14:39 +01:00
Mayhem
e062f1626f Remove Cooldown Prediction. 2014-02-05 09:32:01 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
bcd7ab21e3 Make the JSON Navigation / Index features optional 2014-01-13 19:33:42 -07:00
Jordan
ce5a6f2552 Shortcut icons now default 2014-01-08 21:14:21 -07:00
Zixaphir
c36d62d5ce Cleanup and fix remaining issues from seaweedchan/4chan-x#212 2013-12-18 12:15:13 -07:00
Zixaphir
7958371a24 I have no idea how I enabled that by default. I == dumb 2013-12-16 18:29:45 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
 2013-12-16 12:56:09 -07:00
Mayhem
ceff7c5d5f Add Refreshed Navigation setting. 
Close #1323, #1332.
 2013-12-12 02:03:18 +01:00