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

14 Commits

Author SHA1 Message Date
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
Mayhem
6975a766b9 Update font-awesome. 2013-11-07 22:34:41 +01:00
Mayhem
0038f1f011 Slightly better consistency between "reload"/"refresh"/"update" usage. 2013-11-02 19:21:04 +01:00
Mayhem
4ff5fd287a Update FontAwesome. 2013-10-23 21:13:10 +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
03821c1ac9 Add our toggleable features and such 2013-08-12 18:41:38 -07:00
Zixaphir
e0895c594a Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-08-12 18:26:39 -07:00
Mayhem
a92afa5679 Add fetching status at the top of the thread watcher. #99 2013-08-12 21:41:13 +02:00
Mayhem
6261160891 Start the Thread Watcher rewrite. #99 
Fix #1112.
 2013-08-12 19:20:56 +02:00
Zixaphir
0ac6747810 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	json/archives.json
	src/General/Main.coffee
 2013-07-24 21:55:26 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
 2013-07-21 08:39:40 -07:00
James Campos
2efd04f47e format ThreadStats.html 2013-06-15 00:47:17 -07:00
Mayhem
121bd1834c Add page number in Thread Stats. Close #832 2013-05-26 01:06:01 +02:00
Nicolas Stepien
010618a6ef Move some html out the code. 2013-04-27 04:30:31 +02:00