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

4700 Commits

Author SHA1 Message Date
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
ccd0
76639c1299 Remove check for audio until we get word on where it's allowed. 2015-01-30 22:07:52 -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
c2a5bff378 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-28 13:55:49 -08:00
ccd0
ce009a23f0 Make thread updater more robust. #307 2015-01-28 13:47:56 -08:00
ccd0
be8c817ae9 Remove another duplicated event handler. 2015-01-27 22:24:28 -08:00
ccd0
30af8f729c Remove redundant line that adds multiple blur event handlers. 2015-01-27 21:23:51 -08:00
ccd0
afa6ec9dd4 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-27 10:52:15 -08:00
ccd0
b2f11910b3 Fix reloading of noscript captcha images that failed to load the first time. 2015-01-27 10:46:22 -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
a720609a1c Fix merge mistake. 2015-01-26 03:42:03 -08:00
ccd0
19bbe8fe9e Add missing config entry for Disable Autoplaying Sounds. 2015-01-26 03:16:35 -08:00
ccd0
d6cb44af7b Don't intercept QR keybinds when QR or posting is disabled. 2015-01-26 03:09:34 -08:00
ccd0
d65dc2ca97 Fix a bunch of feature initialization conditions. 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Filtering/PostHiding.coffee
	src/General/Index.coffee
	src/General/Navigate.coffee
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageLoader.coffee
	src/Menu/Labels.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadWatcher.coffee
 2015-01-26 02:57:55 -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
91d4e2434a Remove some redundant CloseMenu events. 2015-01-25 18:24:58 -08:00
ccd0
e079c55e60 Consolidate QR Shortcut code. 2015-01-25 18:19:31 -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
b93ee0fb11 Fix quoting-you in thread watcher on /archive page. 2015-01-25 13:59:25 -08:00
Zixaphir
ee022ce8ea Fix #826 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2015-01-25 13:30:08 -08:00
ccd0
56efa1d829 Fix Fappe Tyme in /f/. 2015-01-25 10:42:24 -08:00
Zixaphir
8e7f509877 newlines 2015-01-25 10:25:15 -08:00
Zixaphir
29fd66898e Move download function in ImageCommon 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageCommon.coffee
 2015-01-25 10:24:49 -08:00
Zixaphir
c84a8abd55 Add download functionality to Gallery, as originally intended. 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2015-01-25 10:03:54 -08:00
ccd0
bed88c3324 Remove contract button; work around controls by estimating their position. 2015-01-25 09:41:48 -08:00
ccd0
5501d42246 Thread watcher menu fixes. 
- fix setting saving
- restore tooltip description
- update UI.checkbox call
 2015-01-24 21:16:59 -08:00
ccd0
af6e9bd6ef Get.threadFromNode selects the wrong thread for inlined quotes. 2015-01-24 20:45:34 -08:00
ccd0
510aa71e81 Fix duplicated text in thread watcher. 2015-01-24 17:05:28 -08:00
ccd0
79714c6ab9 Fix whenModified argument. 2015-01-24 15:51:05 -08:00
ccd0
02888aac1a Merge branch 'master' of https://github.com/zixaphir/appchan-x 2015-01-24 11:11:35 -08:00
ccd0
fb0a4c51f5 Fix suffixes. 2015-01-24 11:08:26 -08:00
ccd0
6d2a3dfefb ImageLoader.quotePreviews -> playVideos 2015-01-24 10:32:06 -08:00
Zixaphir
c6755650ac Build stuff 2015-01-24 11:03:48 -07:00
ccd0
95bd98d5c9 Fix jsmath listener. 2015-01-24 02:03:02 -08:00
ccd0
dccf88cf13 Fix slide delay being missing from gallery submenu in header. 2015-01-23 23:54:43 -08:00
ccd0
34888c1dcb Fix missing Gallery.cb.toggleSlideshow. 2015-01-23 23:48:59 -08:00
ccd0
fe188e12b3 Don't set loop attribute of non-video. 2015-01-23 23:02:13 -08:00