30 Commits

Author SHA1 Message Date
ccd0
70486be734 fix inconsistent brackets in Sauce intructions 2014-06-29 18:28:19 -07:00
ccd0
7e7645bf1a add boards and types options to sauce links; update example list 2014-06-29 04:41:52 -07:00
ccd0
3fa001636d %% in format string = literal % 2014-06-29 02:47:06 -07:00
ccd0
cae730dd79 rewrite some code to make make safety more obvious 2014-05-15 02:25:45 -07:00
ccd0
b263cd73ba remove string interpolation from most HTML files 2014-05-15 00:01:28 -07:00
ccd0
c4962b015a point to the issues page 2014-04-07 21:25:50 -07:00
ccd0
0a3bdbe2c9 fix spacing in settings 2014-04-07 21:22:07 -07: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
Kabir Sala
d22dceea5a Add Metro favicon (why not?) 2014-02-10 18:00:34 +01:00
Zixaphir
2ac2286ad5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee
2014-01-28 01:11:06 -07:00
Zixaphir
f133da454d Fix settings dialog, customize reset button 2014-01-22 12:24:30 -07: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
Zixaphir
2bf8d37781 Add the 4chanJS favicon to settings 2014-01-12 15:24:00 -07:00
Zixaphir
860ca555b7 This line was in error.
QR Personas are *always* enabled.
2014-01-12 13:43:10 -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
Zixaphir
38010c0b26 A couple of small things 2013-10-13 13:57:36 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -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
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