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

217 Commits

Author SHA1 Message Date
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
Mayhem
41c22af15f GM2 incoming! 2014-06-19 04:34:37 +02:00
Zixaphir
d08ccf7ddb Slight reflow 
I doubt we'll ever have a video in a 404'd tab. srsly.
 2014-05-16 09:17:23 -07:00
Zixaphir
39b0587ddf Fix zixaphir/appchan-x#725 2014-05-16 09:14:44 -07:00
Zixaphir
8cf9ad236a I thought I fixed that already? OH WELL 2014-05-11 16:28:56 -07:00
Brandon
e4efa68044 fix #714 2014-05-03 16:04:29 -07:00
Zixaphir
fd76d85c07 Invalid string 2014-05-03 06:37:49 -07:00
Zixaphir
0fdeae4e77 Consolidate dimension-check code into QR.post. 
Reduces redundant generation of video/image elements for thumbnail
generation and dimension check code by merging them into one routine
 2014-05-03 06:05:28 -07:00
Zixaphir
a1601d8825 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Monitoring/ThreadStats.coffee
 2014-05-03 02:45:58 -07:00
Zixaphir
523d6bd9c4 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/css/style.css
	src/General/html/Build/post.html
	src/General/html/Features/Index-navlinks.html
	src/General/lib/post.class
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/Banner.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/Quotify.coffee
 2014-05-03 02:03:35 -07:00
Zixaphir
ca9b0517de Merge some changes from appchan. 2014-05-03 01:09:35 -07:00
Mayhem
a9b05047be Build pathnames taking into account the thread slug. 2014-04-30 15:30:46 +02:00
ccd0
9c820f123d Revert "fix moot using a dummy Recaptcha key on several pages" 
This reverts commit 74f270c3afa2daf8f64ea75d5f02752822a08579.
Looks like moot has fixed the problem, so we won't need this anymore.
 2014-04-27 10:56:06 -07:00
ccd0
74f270c3af fix moot using a dummy Recaptcha key on several pages 2014-04-27 09:07:06 -07:00
ccd0
d0e9ec84ef dispatch 4chanXInitFinished events when in catalog 2014-04-26 20:35:38 -07:00
ccd0
da8ba3cf8c change /res/ URLs to /thread/ so our quote links don't reload the page 2014-04-20 10:46:32 -07:00
ccd0
823eace903 begin work on restoring comment expansion 2014-04-19 21:44:13 -07:00
ccd0
4f8b640e2c preserve hash when removing slugs 2014-04-19 16:26:37 -07:00
ccd0
2d5b1646ca remove slugs, at least until moot fixes his HTML 2014-04-19 16:10:05 -07:00
Zixaphir
4b3f4d1baf Merge branch 'ccd0' into v3 
Conflicts:
	builds/crx.crx
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
 2014-04-12 18:02:25 -07:00
ccd0
daff73a2c4 begin migration to new URLs 2014-04-12 09:55:06 -07:00
Mayhem
c7b7795261 Start supporting new semantics. 2014-04-12 18:01:03 +02:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
 2014-04-10 23:08:43 -07:00
ccd0
ff057d4f29 configure videos opened in new tab 2014-04-10 01:33:11 -07:00
ccd0
47eea2a57a implement duckness's upgrade nag disabling option 2014-04-06 16:10:05 -07:00
ccd0
31eac580aa implement duckness's upgrade nag disabling option 2014-04-06 10:17:26 -07:00
ccd0
730f275406 remove unneeded entry from feature initialization list 2014-04-05 14:20:18 -07:00
ccd0
342672bab3 implement length 1 queue of videos to be deleted 2014-04-04 22:11:17 -07:00
Zixaphir
18db3994b6 Backport fixes from master branch 2014-03-20 09:37:27 -07:00
Zixaphir
ca9abdc4e7 Remove Main.callbacknodes 2014-03-14 16:02:19 -07:00
Zixaphir
c3a71e0ba3 >$.ready 2014-03-08 16:25:18 -07:00
Zixaphir
cf1a4c1cc4 Phase out vanilla catalog 2014-03-08 16:14:16 -07:00
Zixaphir
3237416133 Really though, what did that ever accomplish? Why did I do that? 2014-03-06 11:01:10 -07:00
Zixaphir
6760d4b948 Fix some issues causing Navigation functions to fail. 2014-03-03 00:03:55 -07:00
Zixaphir
a4ead91d65 Remove some accidental cruft left from incorrectly merging 
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers
 2014-03-02 18:59:35 -07:00
Zixaphir
811e3ccaf3 Use our implementation of Navigating between boards 
Our custom navigation should now behave similar to Mayhem's, but
with JSON.
 2014-02-28 18:56:02 -07:00
Zixaphir
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet) 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.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.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2014-02-23 14:04:45 -07:00
Zixaphir
8fa130c2df Backport @vampiricwulf's flash features 2014-02-23 08:32:06 -07:00
Mayhem
ce2b9ee170 Add post labelling. 2014-02-22 00:17:47 +01:00
Mayhem
61510ca272 Add {Post,Thread}::{hide,show}(). Merge reply hiding and thread hiding. 2014-02-22 00:17:47 +01:00
Mayhem
f6f1126130 Quote markers. 2014-02-08 18:05:33 +01:00
Mayhem
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog 
Drop support for the inline catalog
 2014-02-05 18:03:40 +01:00
Mayhem
0675146d22 Add pin/hide/show thread menu entries for the catalog. 2014-02-04 13:51:21 +01:00
Mayhem
81b2c8eef2 Add catalog switcher button in the inline catalog. 2014-01-29 17:51:19 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
 2014-01-22 12:10:34 -07:00
Mayhem
508ab4f884 Make $.addClass/rmClass use multiple classes at once. 2014-01-21 15:30:47 +01:00
Mayhem
59fa428db5 Warn about Firefox versions <26. 2014-01-21 13:58:50 +01:00
Mayhem
fdd6a20c87 rm useless code 2014-01-20 09:51:52 +01:00