23 Commits

Author SHA1 Message Date
Jordan Bates
368a5ee5c0 Fix #141 2013-08-13 15:20:20 -07:00
seaweedchan
b8062b0323 Merge Mayhem X 2013-08-13 00:39:05 -07:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -07:00
Zixaphir
c71660bf60 Small oversight while merging 2013-08-12 18:55:06 -07:00
Zixaphir
03821c1ac9 Add our toggleable features and such 2013-08-12 18:41:38 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
8b01a46f30 I have a thing about these kinda things. 2013-08-07 01:54:29 -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
Jordan Bates
55447378f1 Some people find the custom nav guide confusing 2013-05-20 17:17:45 -07:00
Zixaphir
1bb474d28f Add board selection to the archive selection.
Close seaweedchan/issues/80
2013-05-14 09:40:50 -07:00
Jordan Bates
f4e3629b4c Remove Archive section, put back into Advanced 2013-05-13 07:17:19 -07:00
Zixaphir
249a739bfc Add @MayhemYDG's archive redirection 2013-05-12 09:00:00 -07:00
Jordan Bates
629671092c Update changelog, change note for custom nav 2013-05-10 05:08:13 -07:00
Zixaphir
5e105642ca Use a textarea for custom navigation. 2013-05-10 04:13:13 -07:00
Jordan Bates
6eba459a7b Use , instead of -url 2013-05-10 03:44:27 -07:00
Jordan Bates
f1c2ca4691 External links 2013-05-10 03:25:25 -07:00
Jordan Bates
f301551163 Spoiler styling, close #64 2013-05-09 01:48:28 -07:00
Jordan Bates
742cad08ce Move dump button 2013-05-09 00:36:10 -07:00
Jordan Bates
39b4a3b1d2 Move filerm inside container 2013-05-07 23:40:19 -07:00
Zixaphir
2158d35285 Add @detharonil's %Y and more future-proof %y 2013-05-05 17:39:30 -07:00
Jordan Bates
81d65cc3ca QR doesn't need its own settings section 2013-05-01 02:46:29 -07:00
Jordan Bates
b7087b249e These mistakes happen too often for me to not put them in .gitignore 2013-04-28 10:45:31 -07:00
Jordan Bates
4f779ae64d Merge Mayhem X 2013-04-28 10:37:12 -07:00