16 Commits

Author SHA1 Message Date
Zixaphir
1debf61f2e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -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
Zixaphir
c4a008f402 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
2013-05-10 07:19:08 -07:00
Jordan Bates
629671092c Update changelog, change note for custom nav 2013-05-10 05:08:13 -07:00
Zixaphir
d8db801341 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html
2013-05-10 04:58:26 -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
376a7a1218 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
2013-05-05 19:21:56 -07:00
Zixaphir
2158d35285 Add @detharonil's %Y and more future-proof %y 2013-05-05 17:39:30 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
2013-05-03 07:17:59 -07:00
Jordan Bates
81d65cc3ca QR doesn't need its own settings section 2013-05-01 02:46:29 -07:00
Zixaphir
77433f5da8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07:00
Jordan Bates
4f779ae64d Merge Mayhem X 2013-04-28 10:37:12 -07:00