110 Commits

Author SHA1 Message Date
Zixaphir
073f69d804 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Header.coffee
2014-01-07 12:12:29 -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
dcd6547169 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/General/Header.coffee
2013-12-27 15:35:34 -07:00
Zixaphir
9262e8a7af Messing around with some syntax 2013-12-26 15:50:02 -07:00
Zixaphir
3adce28107 Attempt to do something about #456
This issue is all kinds of weird and the only people I can blame
seem to be Mozilla? I'm serious here, how else does a browser
*SOMETIMES* render a filter, but seem to always render it if it's
a Data URI instead of just an ID ...reference? I guess? I don't
know, piss off.
2013-12-25 20:18:18 -07:00
Zixaphir
4ee6e58994 Merge branch 'v3' 2013-12-25 18:10:52 -07:00
Zixaphir
abf3da2482 Fix zixaphir/appchan-x#507 2013-12-25 18:04:30 -07:00
Zixaphir
d7ceb42446 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/font-awesome.css
	src/Miscellaneous/CatalogLinks.coffee
2013-12-18 16:17:11 -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
717bcd557d Fix autohide on scroll 2013-12-16 19:34:56 -07:00
Zixaphir
6c47fb300a Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
2013-12-06 17:20:48 -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
34140232fb Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/General/lib/notice.class
	src/General/meta/metadata.js
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

worksforme.png
2013-11-23 12:56:42 -07: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
Mayhem
6dcf11db66 Don't break Header.hashScroll() for #top and #bottom. 2013-11-02 19:21:05 +01:00
Mayhem
bc72f0f763 Create importHTML function, and use it. 2013-11-02 19:21:05 +01:00
Mayhem
c2984275e5 Add index refresh shortcut in the header bar.
Also fix lazy/lame implementation of Header.addShortcut()
2013-11-02 19:21:04 +01:00
Mayhem
df62c78ed9 After an index refresh, only scroll down if needed. 2013-11-02 19:21:03 +01:00
Mayhem
ef38269981 Initial work for index navigation improvements. 2013-11-02 19:21:02 +01:00
Mayhem
4ff5fd287a Update FontAwesome. 2013-10-23 21:13:10 +02:00
Zixaphir
d4a3bc8a17 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
ccc0335b79 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	css/style.css
	html/Monitoring/ThreadWatcher.html
	json/archives.json
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/img/favicons/empty.gif
	src/Linkification/Linkify.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
Zixaphir
e80797a0fb Separate icons and "stats" in the shortcuts element 2013-08-21 11:26:48 -07:00
Mayhem
6e88579cc8 Close #1250. 2013-08-21 17:25:49 +02:00
Mayhem
a7d26c173d Replace the Header & Thread Watcher menu icon with a FontAwesome icon.
Also fix .brackets-wrap spacing.
2013-08-20 18:18:17 +02:00
Zixaphir
7d626b9cb8 Get "slideout" UI working. 2013-08-20 00:20:29 -07:00
Zixaphir
1facbe7dc1 Get Flex actually working 2013-08-19 09:06:31 -07:00
Zixaphir
eb12134f6c It continues~ 2013-08-19 04:35:06 -07:00
Zixaphir
a730a0bc17 Start IconPositioner rewrite 2013-08-19 02:21:51 -07:00
Zixaphir
cbecf966a9 Fix Desktop Notifications 2013-08-18 21:11:12 -07:00
Zixaphir
72e3fc2585 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/favicons/xat-/unreadDead.png
	src/General/img/favicons/xat-/unreadDeadY.png
	src/General/img/favicons/xat-/unreadNSFW.png
	src/General/img/favicons/xat-/unreadNSFWY.png
	src/General/img/favicons/xat-/unreadSFW.png
	src/General/img/favicons/xat-/unreadSFWY.png
	src/General/meta/banner.js
	src/General/meta/metadata.js
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
seaweedchan
1fb2897baa Some shortcut icon tweaks 2013-08-18 03:42:25 -07:00
Zixaphir
ec32e54ef5 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/General/Config.coffee
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-08-17 21:00:31 -07:00
Zixaphir
d15f8ee728 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	css/style.css
	html/Posting/QR.html
	img/changelog/3.2.0/0.png
	package.json
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Notice.coffee
	src/General/Notification.coffee
	src/General/Settings.coffee
	src/General/img/icon.gif
	src/General/lib/notification.class
	src/Monitoring/Favicon.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07:00
Mayhem
5742405f67 Add desktop notification permission granting setting and notice. 2013-08-17 22:37:30 +02:00
Mayhem
b9afef771d Rename the Notification class to Notice.
To avoid conflicts with window.Notification.
2013-08-17 15:46:21 +02:00
Zixaphir
3432501779 Fix small issue while merging. 2013-08-15 23:13:57 -07:00
Zixaphir
bc501dc022 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/ImageExpand.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-08-15 23:02:54 -07:00
Zixaphir
9d5ef234e9 Fix ToggleBarVisibility keybind 2013-08-15 20:05:46 -07:00
seaweedchan
2fcbe0bf30 Merge Zixaphir X 2013-08-14 03:12:10 -07:00
Zixaphir
1f011dfd02 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Header.html
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-14 03:02:03 -07:00
seaweedchan
6b98f8acb4 Make classes consistent with Mayhem X 2013-08-14 02:41:07 -07:00