550 Commits

Author SHA1 Message Date
Zixaphir
a86b1da74f 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
2013-05-28 05:57:21 -07:00
Jordan Bates
33c1d58d5f Merge Mayhem X 2013-05-27 16:14:36 -07:00
Zixaphir
ca4be499a3 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/Main.coffee
	src/General/css/style.css
2013-05-27 14:22:31 -07:00
Mayhem
acd2f100c9 Fix #1129. 2013-05-27 20:26:37 +02:00
seaweedchan
2c087f1b8d Dont override arrow keys 2013-05-25 23:17:09 -07:00
Zixaphir
7ef6aa71fd 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/Config.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-20 17:06:30 -07:00
Jordan Bates
41a135f1c2 Change view to hide, omitted to expanded, and x Loading... to ... on .summary click. 2013-05-17 04:03:57 -07:00
Zixaphir
70d1d758ec 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/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-15 09:00:09 -07:00
Jordan Bates
f4db0a60ff Merge Mayhem X 2013-05-14 13:32:43 -07:00
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
Jordan Bates
e28116ee3e Dont add - Catalog to title, #69
Didn't work very well anyway.
2013-05-13 22:03:11 -07:00
Jordan Bates
c9858fe863 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-13 06:13:36 -07:00
Jordan Bates
7ce69dc091 Fix #75 2013-05-12 21:44:38 -07:00
Mayhem
97da6173f9 Some people add random text instead of real sauce links. 2013-05-12 22:41:23 +02:00
Zixaphir
a61e9e703f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	changelog-old
	json/archives.json
	src/Monitoring/ThreadUpdater.coffee
2013-05-12 07:00:30 -07:00
seaweedchan
de497f1d03 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-05-11 05:06:23 -07:00
Zixaphir
56518cadd2 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
2013-05-10 23:00:10 -07:00
Zixaphir
0bb1a4db18 Fix Nav.scroll 2013-05-10 22:59:14 -07:00
Zixaphir
e37417481e Workaround for old sauce configurations. 2013-05-10 13:43:58 -07:00
Jordan Bates
4fb8045591 Apparently only the US flag is in troll/. Weird. 2013-05-10 07:25:17 -07:00
Mayhem
aace44479e Fix #1095. 2013-05-10 14:36:27 +02:00
Zixaphir
2a3e0770ce Fix some things broken by removing the Quick Reply option.
close #289, close #291
.__.
2013-05-10 02:48:15 -07:00
Zixaphir
9ce09d216e 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/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Posting/QuickReply.coffee
2013-05-10 02:41:08 -07:00
Jordan Bates
37a5413cb3 Dont forget announcement hiding brackets 2013-05-09 23:56:20 -07:00
Jordan Bates
952d3dcf9c Merge Mayhem announcement hiding changes 2013-05-09 23:22:43 -07:00
Mayhem
7ad882ff2d Only add the "Show announcement" to the header's menu if there is an annoucement on this page.
This simplifies the open function.
2013-05-10 05:47:19 +02:00
Mayhem
0fec8533de Use the announcement's new data-utc value for hiding it. 2013-05-10 05:43:40 +02:00
Zixaphir
5b84565c80 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
2013-05-08 06:24:19 -07:00
Jordan Bates
4bdd604f0f Fix #63 2013-05-08 03:18:23 -07:00
Zixaphir
93b94ec9d0 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/version
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
2013-05-06 16:54:39 -07:00
Jordan Bates
9845a4c4dc Merge zixaphir x 2013-05-05 22:34:17 -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
Jordan Bates
bea9b6caf2 Merge 2013-05-04 16:38:11 -07:00
Mayhem
9b3628b5ae Preserve whitespaces in code tags. Fix #1079 2013-05-04 20:01:52 +02:00
Mayhem
475f166617 Don't pretty-print twice. #1079 2013-05-04 19:56:46 +02: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
Mayhem
363753fc19 Navigate to stubbed threads. #1074 2013-04-30 19:32:12 +02:00
Jordan Bates
e95d49f70e Un-Mayhem 2013-04-29 23:42:59 -07:00
Nicolas Stepien
b18acfcef2 Fix #1076. 2013-04-30 03:35:55 +02:00
Nicolas Stepien
00427cfc52 Close #1073. 2013-04-30 03:31:42 +02:00
Jordan Bates
9dbce3e85e Fix #32 2013-04-29 14:33:57 -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
dfeedc4b00 Toggle keybinds for header auto-hiding 2013-04-28 11:20:09 -07:00
Zixaphir
d5d3ee86f9 Changelog, technical stuff. 2013-04-26 15:08:40 -07:00
Jordan Bates
88321d357f Further update to structure change 2013-04-26 14:19:20 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00
Nicolas Stepien
3244c0f696 Safer hr selecting. 2013-04-26 17:51:37 +02:00
Nicolas Stepien
a2e87f1200 Structure.
God damn War Thunder, download faster!
2013-04-26 17:40:51 +02:00