491 Commits

Author SHA1 Message Date
ccd0
9959524c47 Merge branch 'Stable' into Beta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2014-12-07 16:53:00 -08:00
ccd0
04317e36be Center controls added to audio. 2014-12-07 16:42:19 -08:00
ccd0
7b348a00c6 Fix Remove Spoilers stripping tags. 2014-12-06 01:06:31 -08:00
ccd0
a70e273597 Implement 'Disable Autoplaying Sounds' option. 2014-12-04 13:46:20 -08:00
ccd0
e53cbc335f Fix console errors from Fappe/Werk Tyme keybinds when disabled. 2014-11-22 21:26:25 -08:00
Mayhem
afa889d128 Add keybind to cycle through index sort types.
Conflicts:
	CHANGELOG.md
	src/General/Config.coffee
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
2014-11-09 03:47:59 -08:00
ccd0
aaeff46c2b Fix ID highlighting. 2014-11-02 18:15:12 -08:00
ccd0
f01293b743 Navigating to the index (as opposed to the catalog) will only switch to a non-catalog index mode if Use 4chan X Catalog is enabled. 2014-10-27 22:08:13 -07:00
ccd0
ea3c4d9bc6 Custom CSS should always be added after main CSS.
Also fix issue with "undefined" IDs.
2014-10-25 19:32:16 -07:00
ccd0
a680a5d409 Fix clash between index/catalog link setting in CatalogLinks and Index. 2014-10-18 01:04:02 -07:00
ccd0
a10c0e564a Always remember catalog index mode, redesign catalog/index links. #150 2014-10-18 00:34:51 -07:00
ccd0
5bf0c9ede3 Warn when inserting tags on a board that doesn't support them. 2014-10-16 23:52:06 -07:00
ccd0
747c76e08a Add command+click as an alternative to ctrl+click on OS X (#162). 2014-10-13 19:22:06 -07:00
ccd0
7f920b552f fix privilege escalation vulnerability
Conflicts:
	src/General/Settings.coffee
	src/Quotelinks/QuoteBacklink.coffee
2014-10-09 11:51:41 -07:00
ccd0
ffb0f26716 Cycle through all banners before repeating. 2014-10-08 04:58:43 -07:00
ccd0
84088259a5 Fix the list of banners we select from. 2014-10-07 10:13:15 -07:00
ccd0
b1cfa1b1e3 thread excerpts are default on 4chan; add Remove Thread Excerpt 2014-10-03 00:45:57 -07:00
ccd0
a859f938f1 support Remove Spoilers in catalog 2014-09-27 18:26:01 -07:00
ccd0
cc144eacc2 index navigation work 2014-09-22 02:14:38 -07:00
ccd0
14172c00f0 fix index-only header links 2014-09-20 18:26:14 -07:00
ccd0
3dd0ed6026 add setting to link to 4chan X catalog 2014-09-20 18:02:46 -07:00
ccd0
55ea86d5cd restore index mode condition to Front page keybind 2014-09-20 12:36:06 -07:00
ccd0
99e302eb0c fix keybind conditions 2014-09-19 22:34:01 -07:00
ccd0
9e050bad65 Merge branch 'master' into catalog
Conflicts:
	src/General/lib/thread.class
2014-09-19 22:04:39 -07:00
ccd0
1d96255dd0 fix index settings affecting thread expansion when JSON Navigation is off 2014-09-19 15:51:20 -07:00
ccd0
d70c7c0e51 fix jsMath in catalog 2014-09-19 00:23:56 -07:00
ccd0
bc377f96db disable inapplicable keybinds 2014-09-16 21:21:46 -07:00
ccd0
15a56ec0ae implement PostsInserted and use it in ImageLoader 2014-09-08 10:31:30 -07:00
ccd0
e186c749ec fix CatalogLinks race condition 2014-08-23 18:29:42 -07:00
ccd0
f87380f22f remove "Show Dice Roll" 2014-08-23 10:48:25 -07:00
ccd0
2557f86ace remove Emoji 2014-08-23 10:36:05 -07:00
Zixaphir
3581b32994 Try to do some proper error handling on index load
Also, I thought I nuked InfinitScroll.coffee ages ago?
2014-08-17 19:34:17 -07:00
ccd0
2a5da0a0a9 use Javascript snippets for code in HTML templates 2014-08-03 08:16:23 -07:00
ccd0
cff287c9c3 HTML templates 2014-08-02 22:43:01 -07:00
Zixaphir
7a41feb18f Fix an issue where catalog links were affecting external links zixaphir/appchan-x/#773 (CatalogLinks.coffee part) 2014-08-02 07:40:30 -07:00
Zixaphir
8ba4898158 Fix an issue where catalog links were affecting external links #773 2014-07-31 14:04:15 -07:00
ccd0
f11e9c8801 show actual number of dice rolled when 4chan's limit (currently 25) is exceeded 2014-07-29 09:05:33 -07:00
Zixaphir
04c60a62ef Implement #675 2014-07-27 16:27:53 -07:00
Zixaphir
bf8fedb659 Merge @ccd0's title fix.
Make some funny changes to IDColor
2014-07-26 18:57:41 -07:00
ccd0
a74e8aa4dc get rid of unneeded object 2014-07-01 12:46:40 -07:00
ccd0
3fa001636d %% in format string = literal % 2014-06-29 02:47:06 -07:00
ccd0
0877dc8b8a FileInfo: round bytes also 2014-06-29 00:16:20 -07:00
ccd0
136f778743 rewrite FileInfo for easier XSS checking 2014-06-29 00:05:55 -07:00
ccd0
646c29c4bc fix short filename hover 2014-06-28 22:07:02 -07:00
ccd0
b6739cc45d move HTML escape to global as E 2014-06-28 21:58:14 -07:00
ccd0
9a7f8548a1 add BuildTest keybind 2014-06-27 21:56:24 -07:00
ccd0
20006af4fe prettify tweaks 2014-06-27 21:45:26 -07:00
Zixaphir
64c9c139c1 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:13:41 -07:00
Zixaphir
f103fd0301 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:04:25 -07:00
ccd0
63d7372ad2 a few more tweaks from Mayhem 2014-06-18 23:59:17 -07:00