Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,461 Commits 2 Branches 0 Tags
Commit Graph

4895 Commits

Author SHA1 Message Date
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
3214f9cd0e Allow hyphens in filter highlight CSS classes. #316 2015-02-02 19:55:37 -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
7ab7b178ff Merge branch 'bstable' 2015-02-02 00:11:18 -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
36a95f5709 Merge branch 'bbeta' 2015-02-01 18:43:50 -08:00
ccd0
9881cfb2da Another unwanted comprehension. 2015-02-01 18:22:57 -08:00
ccd0
d46cda1002 Make scroll wheel volume adjustments finer at low volumes. 2015-02-01 18:13:49 -08:00
ccd0
136be3763f Turning off threading should hide the "Thread New Posts" link. 
Also simplify a little.
 2015-02-01 16:28:51 -08:00
ccd0
742184d2c0 Merge from Appchan X: src/Quotelinks 
deferred: QuoteBacklinks.coffee, QuoteMarkers.coffee, and related changes (including change in QuoteInline.qiQuote)
 2015-02-01 16:12:36 -08:00
ccd0
0ec6b290a6 Merge from Appchan X: src/Quotelinks 
deferred: QuoteBacklinks.coffee, QuoteMarkers.coffee, and related changes (including change in QuoteInline.qiQuote)
 2015-02-01 15:42:37 -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
63e0398f51 Fix syncing of mute/volume settings between tabs. 2015-02-01 11:46:21 -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
90f796e192 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
 2015-01-31 23:58:36 -08:00
ccd0
c816d0312b Fix Click Passthrough being applied to images. 2015-01-31 23:54:04 -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
e67b0a774e Volume.onchange -> Volume.change 2015-01-31 21:03:01 -08:00
ccd0
0996ca3112 Unwanted comprehension. 2015-01-31 18:50:20 -08:00
ccd0
a89d2b5b90 Pause muted videos when offscreen. 2015-01-31 18:36:37 -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
160de415d2 Merge branch 'bstable' 2015-01-31 17:26:03 -08:00
ccd0
b8728ebec9 Fix unmuting of videos in inline quotes. 2015-01-31 17:14:33 -08:00
ccd0
8a02642d01 Merge branch 'bstable' 
Conflicts:
	src/Images/ImageExpand.coffee
 2015-01-31 12:22:42 -08:00
ccd0
bd742bcc35 Fix errors from changing QR shortcut before added to document. 2015-01-31 12:01:17 -08:00
ccd0
a85d5b2335 Don't pause WebMs with audio when off screen. 2015-01-31 11:48:28 -08:00
ccd0
c0f4a85a28 Merge from Appchan X: src/Images 2015-01-31 02:57:01 -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
a00f4a9871 /gif/ and /wsg/ allow audio and a larger duration limit. 2015-01-31 02:33:54 -08:00
ccd0
25da29625e Revert "Remove check for audio until we get word on where it's allowed." 
This reverts commit 76639c1299db2e7e84c9fb3e54d4f8f379f46794.
 2015-01-31 02:03:27 -08:00
ccd0
2592e239e5 Merge from Appchan X: src/Posting 2015-01-31 01:35:58 -08:00
ccd0
d983857976 Merge from Appchan X: src/Monitoring 2015-01-31 01:16:03 -08:00
ccd0
7147ad0a01 Merge from Appchan X: src/Miscellaneous 
excluded: CatalogLinks.coffee
deferred: Flash.coffee
 2015-01-31 01:01:56 -08:00
ccd0
eaec80f5a5 Merge from Appchan X: src/Menu 
excluded: Labels.coffee
 2015-01-31 00:51:44 -08:00
ccd0
5b3ed17296 Merge from Appchan X: src/Filtering 
excluded: PostHiding.coffee, ThreadHiding.coffee
 2015-01-31 00:49:28 -08:00
ccd0
9067559a0d Merge from Appchan X: src/Images 2015-01-31 00:40:26 -08:00
ccd0
8e3abdbe7a Read max WebM filesize from the page. 2015-01-31 00:19:06 -08:00
ccd0
29b78bf377 Fix sound playing from replaced WebM thumbnails in previewed/inlined quotes. 2015-01-30 23:24:46 -08:00