2747 Commits

Author SHA1 Message Date
ccd0
8bc8530bea Merge branch 'master' into zixaphir-merge 2015-02-03 01:50:01 -08:00
ccd0
aa1d2cda7f Fix custom navigation for unlisted board links (e.g. /qa/) and the 4chan Twitter link. #309 2015-02-03 01:26:35 -08:00
ccd0
8c17090b3d Merge from Appchan X: src/General/Header.coffee 2015-02-03 00:26:13 -08:00
ccd0
e1b63d4a99 Follow Zixaphir in adding space to label in UI.checkbox.
Change settings checkbox (where space was unwanted) to HTML template.
2015-02-03 00:23:44 -08:00
ccd0
7136baeceb Merge from Appchan X: src/General/Header.coffee 2015-02-03 00:17:09 -08:00
ccd0
343c044761 Follow Zixaphir in adding space to label in UI.checkbox.
Change settings checkbox (where space was unwanted) to HTML template.
2015-02-02 22:59:06 -08:00
ccd0
afc505c42e Merge from Appchan X: src/General/Config.coffee 2015-02-02 22:14:34 -08:00
ccd0
747c9f9aad Merge branch 'get-refactor' into zixaphir-merge
Conflicts:
	src/General/Get.coffee
2015-02-02 21:34:57 -08:00
ccd0
332e00342e Merge from Appchan X: src/General/Get.coffee
deferred: adding dataset.fullID for simpler Get.thread/postFromRoot
2015-02-02 21:12:27 -08:00
ccd0
b06d3d77ec Add manager capcode. 2015-02-02 19:28:31 -08:00
ccd0
45f8caf2d2 Fix a few more Build.staticPath. 2015-02-02 19:14:39 -08:00
ccd0
e38887df0d Merge from Appchan X: src/General/Build.coffee 2015-02-02 19:13:51 -08:00
Zixaphir
00541ba898 Speed E the fuck up
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Globals.coffee
2015-02-02 19:06:31 -08:00
ccd0
a993cb8244 Merge branch 'master' into zixaphir-merge
Conflicts:
	src/Quotelinks/QuoteThreading.coffee
2015-02-02 12:02:21 -08:00
ccd0
9b868b760b Add link to extract titles from WebM metadata. 2015-02-02 02:49:28 -08:00
ccd0
97cc25799d Revert "Make 'Image Hover in Catalog' a suboption of 'Image Hover'."
This reverts commit afb1f0a57249398a2f840d6dad2a96c17b1e981a.

Conflicts:
	src/Images/Volume.coffee
2015-02-02 00:05:29 -08:00
ccd0
c70921e176 Merge branch 'master' into zixaphir-merge
Conflicts:
	src/Filtering/Filter.coffee
	src/General/Index.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
2015-02-01 13:41:36 -08:00
ccd0
d79ffca82d Control volume in new tabs. 2015-02-01 10:56:46 -08:00
ccd0
b47809d047 Remember index mode regardless of how it was chosen. 2015-02-01 00:51:47 -08:00
ccd0
8263d61d80 Merge branch 'bstable'
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
	src/Images/ImageExpand.coffee
2015-01-31 23:43:10 -08:00
ccd0
afb1f0a572 Make 'Image Hover in Catalog' a suboption of 'Image Hover'. 2015-01-31 23:23:37 -08:00
ccd0
769dec0b50 Implement 'Click Passthrough' option, restore button and left-dragging. 2015-01-31 23:16:13 -08:00
ccd0
698533233b Control volume of hovering videos with mouse wheel. 2015-01-31 22:26:13 -08:00
ccd0
0fa2498d71 Remember mute/volume settings of last video adjusted.
Also put mute/volume controls in the header menu.
2015-01-31 17:56:45 -08:00
ccd0
a85d5b2335 Don't pause WebMs with audio when off screen. 2015-01-31 11:48:28 -08:00
ccd0
8df52a0b24 Merge from Appchan X: Whitespace and other changes not affecting compiled script. 2015-01-31 02:50:38 -08:00
ccd0
29b78bf377 Fix sound playing from replaced WebM thumbnails in previewed/inlined quotes. 2015-01-30 23:24:46 -08:00
ccd0
43454eae88 WebMs with sound sighted on /wsg/! 2015-01-30 22:00:08 -08:00
ccd0
b824b5f180 Merge from Appchan X: src/Archive 2015-01-30 20:44:28 -08:00
ccd0
94928b7c83 Merge from Appchan X: Whitespace and other changes not affecting compiled script. 2015-01-30 01:22:40 -08:00
ccd0
c1a1710f81 Merge branch 'bstable' into bbeta
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
2015-01-26 23:22:24 -08:00
ccd0
b6541bfc52 Use cursor: pointer for expanded WebMs. #299 2015-01-26 23:18:39 -08:00
ccd0
550d0dbd75 Fix Thread Updater setting description. #303 2015-01-26 21:59:55 -08:00
hotdogman
50b98e2a4b Enable pinning of watched threads by default
Pin/anchor watched threads to the top of the catalog by default.
2015-01-26 22:35:07 -06:00
ccd0
19bbe8fe9e Add missing config entry for Disable Autoplaying Sounds. 2015-01-26 03:16:35 -08:00
ccd0
fe81085b0f Bump Appchan X copyright year. 2015-01-26 02:13:52 -08:00
ccd0
813de2b71b Fix race condition causing Index.root to be removed. 2015-01-26 01:46:02 -08:00
ccd0
d75dcda461 Fix a bunch of feature initialization conditions. 2015-01-26 00:57:17 -08:00
ccd0
0e10415d71 Revert "Ignore /pol/ fakedoubles in HTML building test."
This reverts commit 37f0872f886a3c9c2538d233ea47e8c94d308aa4.

Conflicts:
	src/General/lib/post.class
2015-01-25 15:08:16 -08:00
ccd0
930a8a4307 Remove /pol/ flags properly. 2015-01-25 14:57:39 -08:00
ccd0
fce15eced5 Revert "Turn off /pol/ flags for now."
This reverts commit 60266a686d5f009a88641d5ba451d37f5e879519.

Conflicts:
	src/General/Build.coffee
2015-01-25 14:02:09 -08:00
ccd0
bed88c3324 Remove contract button; work around controls by estimating their position. 2015-01-25 09:41:48 -08:00
Zixaphir
c6755650ac Build stuff 2015-01-24 11:03:48 -07:00
ccd0
9693ea5821 Make custom 'current' board links work on unlisted boards. 2015-01-23 12:20:22 -08:00
Zixaphir
42beae7760 Fix the '-text' option with custom navigation #865 2015-01-22 12:36:33 -07:00
Zixaphir
7729784ee7 Fix a couple things with thread hiding 2015-01-22 09:36:48 -07:00
Zixaphir
6eb21cad76 Fix some spacing issues with the header and shortcuts. #865 2015-01-21 09:09:43 -07:00
ccd0
b6d3f73951 Fix clash between bottom header and jsMath button. 2015-01-20 15:53:52 -08:00
Zixaphir
2bd86b1acd Fix #830 scroll problem. 2015-01-20 16:52:52 -07:00
Zixaphir
310c5933ae Fix #827 2015-01-20 15:36:12 -07:00