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

109 Commits

Author SHA1 Message Date
Zixaphir
523d6bd9c4 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/css/style.css
	src/General/html/Build/post.html
	src/General/html/Features/Index-navlinks.html
	src/General/lib/post.class
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/Banner.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/Quotify.coffee
 2014-05-03 02:03:35 -07:00
ccd0
726267d538 fix catalog settings link 2014-04-26 19:21:21 -07:00
Zixaphir
7fc970f4c4 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
 2014-04-07 18:58:17 -07:00
Mayhem
fba314e05a Pause videos when they are not visible. #1538 2014-04-07 11:06:34 +02:00
Zixaphir
cefb710c04 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Header.coffee
 2014-03-27 13:50:02 -07:00
Mayhem
d1a305a888 Hide and don't use the header hitzone when unnecessary. 2014-03-20 16:21:22 +01: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
Mayhem
3b183d7283 Nuke toggling the header auto-hide by clicking on its border. 2014-03-10 09:29:30 +01:00
Zixaphir
ec7ec57b93 Fix external-text:"","" 2014-03-06 23:02:49 -07:00
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
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
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07: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
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
8b5912b77d Archive links with no archive should keep custom text. 
Don't return too early then.
 2014-02-15 16:08:17 +01:00
Mayhem
fe5f19d705 Add board-mode and board-sort to custom board navigation. 2014-02-14 21:44:29 +01:00
milky
e20e682736 Convert anchor to text node. 2014-02-09 07:17:56 +11:00
milky
f7b4e0556d Clearer when archive links are N/A. 2014-02-09 07:00:15 +11:00
Mayhem
1d9b0d78a9 board -> boardID in Header.generateBoardList(). 2014-02-08 18:07:11 +01:00
milky
4eb0574505 Further archive link work. 2014-02-06 05:47:19 +11:00
milky
3284de0d06 Archive link. 2014-02-06 05:02:36 +11:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01: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
Mayhem
0b39d6d3f5 Simplify export settings code. 
Firefox does let us download links now.
 2014-01-22 15:50:00 +01:00
Mayhem
8a3af6f69f Toggling Header auto-hide on scroll should update the Conf too now. 2014-01-22 09:52:44 +01:00
Mayhem
508ab4f884 Make $.addClass/rmClass use multiple classes at once. 2014-01-21 15:30:47 +01:00
Mayhem
a8068c083f Fix #1384. 2014-01-21 10:20:08 +01:00
Zixaphir
bcd7ab21e3 Make the JSON Navigation / Index features optional 2014-01-13 19:33:42 -07:00
Zixaphir
ac4229c578 Lets approach this with intelligence, m'kay? 2014-01-10 13:51:32 -07:00
Zixaphir
e615973436 Optimize header regeneration 2014-01-10 13:12:43 -07:00
Zixaphir
0d29b42a02 This kills the script 
No, seriously, this commit breaks everything if you open a reply.
It's k, though, that's why this branch exists: so I can break it
all without harming end users and stable development.

Holy carp, though, the amount of errors thrown!
 2014-01-09 18:51:49 -07:00
Zixaphir
1e7fc8ea65 Reflows. 2014-01-08 15:40:57 -07:00
Zixaphir
fca2645787 Improve navigation between boards 
Also allow navigation to indexes from boards.
 2014-01-08 11:40:58 -07:00
Zixaphir
ac62980325 Fix .current 2014-01-07 22:31:17 -07:00
Zixaphir
21056d72f9 Well, fuck. Looks like we're generating board indexes now. :D 2014-01-07 20:15:49 -07:00
Zixaphir
798ab20f35 ThreadUpdater.disconnect() 2014-01-07 16:30:18 -07:00
Zixaphir
4ce942c540 Looks like I failed to understand exactly what was happening here 2014-01-07 12:10:08 -07:00
Zixaphir
767b89a82c da fuq? 2014-01-07 11:56:54 -07:00
Zixaphir
456c9af18d Bind an index refresh to the current board's link 
I mean, this makes sense, right?
 2014-01-07 11:52:07 -07:00
Zixaphir
9262e8a7af Messing around with some syntax 2013-12-26 15:50:02 -07:00
Zixaphir
abf3da2482 Fix zixaphir/appchan-x#507 2013-12-25 18:04:30 -07:00
Zixaphir
2fa6e063ef Not sure how that happened. 2013-12-18 16:11:45 -07:00
Zixaphir
c36d62d5ce Cleanup and fix remaining issues from seaweedchan/4chan-x#212 2013-12-18 12:15:13 -07:00
Zixaphir
adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee
 2013-12-06 17:11:36 -07:00
Mayhem
1e621a7fe4 Fix #1363. 2013-12-05 17:45:00 +01:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything 
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
 2013-11-22 17:25:06 -07:00
noface
216dca44ae Add hide header on scroll. Close #1138 2013-11-21 02:10:23 +01:00
Mayhem
6975a766b9 Update font-awesome. 2013-11-07 22:34:41 +01:00
Mayhem
81a2b096a1 Introduce Header.{scrollToIfNeeded,getTopOf,getBottomOf}() and use them. 
4chan X - now with proper bottom header support.
 2013-11-03 01:27:23 +01:00
Mayhem
6460d5e0c1 Fix early notices. 2013-11-02 19:21:06 +01:00