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

3115 Commits

Author SHA1 Message Date
ccd0
b6541bfc52 Use cursor: pointer for expanded WebMs. #299 2015-01-26 23:18:39 -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
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
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
79714c6ab9 Fix whenModified argument. 2015-01-24 15:51:05 -08:00
ccd0
03e70ce13e Merge remote-tracking branch 'archives/master' 2015-01-23 14:50:39 -08:00
ccd0
f0150afd69 Remove announcements rather than hiding them. 
Fixes sounds playing from hidden announcements.
 2015-01-23 14:43:38 -08:00
ccd0
d8d976e6fa Merge remote-tracking branch 'archives/master' 
Conflicts:
	src/Archive/archives.json
 2015-01-23 12:27:12 -08:00
ccd0
9693ea5821 Make custom 'current' board links work on unlisted boards. 2015-01-23 12:20:22 -08:00
ccd0
3fd621cf1d Avoid Coffeescript returning list comprehension. 2015-01-21 16:14:54 -08:00
ccd0
83f1d4ca01 Add Flash Youtube to anti-autoplay. 2015-01-21 15:59:34 -08:00
ccd0
8f13c7e9e0 Fix removal of HTML from non-custom titles. #297 2015-01-21 15:49:46 -08:00
ccd0
b6d3f73951 Fix clash between bottom header and jsMath button. 2015-01-20 15:53:52 -08:00
ccd0
ff8ddc347c Fix gallery fit width in Firefox. zixaphir/appchan-x#824 2015-01-19 16:15:57 -08:00
ccd0
f30323fa41 Fix jsMath image fonts on tomorrow theme. 2015-01-16 23:24:49 -08:00
ccd0
1120b9a69e Fix Catalog Links sync not updating checkbox. 2015-01-13 19:20:10 -08:00
ccd0
e740bf8969 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
 2015-01-13 19:02:14 -08:00
ccd0
81b03063cf Better treatment of bottom board list. #291 
Should fix conflict with native catalog.
 2015-01-13 18:52:32 -08:00
ccd0
f8d0939953 Don't change CSS class of body. #290 2015-01-12 16:39:06 -08:00
ccd0
fe491f645d 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
 2015-01-12 15:50:17 -08:00
ccd0
9ec108ef3d Fix missing favicon. #289 2015-01-12 15:48:26 -08:00
ccd0
a4a8b85f8c Make reply hiding button insertion more efficient. 2015-01-12 00:14:26 -08:00
ccd0
2ff364defe Also add replies-unread to icon when appropriate (no highlighting by default). 2015-01-11 15:00:08 -08:00
ccd0
9737cb47d5 Highlight thread watcher icon when there are unread replies and the thread watcher is hidden. 2015-01-11 14:47:05 -08:00
ccd0
d189e1beed Merge branch 'Beta' 2015-01-11 13:42:12 -08:00
ccd0
ca65e5ac76 Fix bottom board list after 4chan change. #285 2015-01-11 13:40:01 -08:00
ccd0
240a57c72c Add timer for thread watcher. 2015-01-11 10:51:08 -08:00
ccd0
f4ee994bf7 ThreadWatcher: Move parsing code out of anonymous function. 2015-01-10 22:24:26 -08:00
ccd0
c6fcbf5de1 Add Unique ID to archive search menu. 2015-01-10 21:32:55 -08:00
ccd0
501c0c3c62 Revert "Use our own thread excerpt for /pol/ instead of 4chan's." 
This reverts commit f302befec7c392108b1640343bc6ec5a38c8d92f.
 2015-01-10 20:50:57 -08:00
ccd0
9d7da5817e 4chan X -> meta.name 2015-01-10 19:01:15 -08:00
ccd0
23595c9b64 Remove page number from title in JSON index. 2015-01-10 12:59:46 -08:00
ccd0
db4b6cf8d2 Revert "Revert "Add link from native catalog to 4chan X catalog. #247"" 
This reverts commit 98d26d7191e773e919429d55c70fb3ebcc2a079a.
 2015-01-09 17:48:12 -08:00
ccd0
a1217506e0 On further consideration, I'd rather not redirect. #247 2015-01-09 17:47:15 -08:00
ccd0
2a24afd27d Fix </a> tag that shouldn't be there. 2015-01-09 16:19:57 -08:00
ccd0
782fe3c690 Revert "Fix quotelinks on /pol/." 
This reverts commit ae3e7eaef315e4beda88ef53bbb273c2cbd479be.

Conflicts:
	src/Quotelinks/Quotify.coffee
 2015-01-08 19:35:24 -08:00