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

987 Commits

Author SHA1 Message Date
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
d8b8028459 Deal with some undefined behavior 2014-05-03 02:08:24 -07:00
Zixaphir
94332e2f62 Duplicate Config option 2014-05-03 02:05:09 -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
b5b86cd32f Don't mess with the wrong <hr>. 2014-04-30 15:49:13 +02:00
Mayhem
92afc23ef7 Merge pull request #1603 from Hupotronic/parsefile-fix 
Use childNodes[2] for finding file resolution
 2014-04-30 15:35:44 +02:00
Mayhem
a9b05047be Build pathnames taking into account the thread slug. 2014-04-30 15:30:46 +02:00
Hupotronic
174e540ee2 Use childNodes[2] for finding file resolution 
ExLinks support vanilla 4chan and can add in its reverse image search link to the .fileText before 4chan X manages to parse it. As a result, 4chan X ends up looking at the reverse image search link for dimensions instead of the correct text element. Using childNodes[2] instead of lastChild fixes this.
 2014-04-30 15:38:07 +03:00
Mayhem
61f57a7091 Fix #1602 2014-04-30 09:31:36 +02:00
Mayhem
9d4a7441e3 Fix parsing quotelinks in threads with slugs. 
Fix #1577
Fix #1580
Fix #1589
Close #1598
 2014-04-30 09:11:38 +02:00
Mayhem
ad8610b522 Pages start at 1 now. 2014-04-29 15:12:42 +02:00
ccd0
4fe98beb41 update setting description 2014-04-29 04:09:32 -07: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
726267d538 fix catalog settings link 2014-04-26 19:21:21 -07:00
Matěj Grabovský
20a5b89757 Use an elegant selector instead of a condition 2014-04-23 21:58:14 +02:00
Matěj Grabovský
373766e91a Fix Post.cleanup() breaking EXIF toggling 2014-04-23 21:43:45 +02:00
ccd0
c64c9e23a5 fix my CSS again 2014-04-20 21:00:31 -07:00
ccd0
6c8e5e9297 probably not worth fixing 2014-04-20 14:08:23 -07:00
ccd0
bb8e75db34 fix chromium autohiding while resizing 2014-04-20 13:29:06 -07:00
ccd0
5c3891e43c fix QR being autohidden when it has focus 2014-04-20 13:01:43 -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
Zixaphir
871d7820b7 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2014-04-20 07:15:14 -07:00
Mayhem
71a88631ef Fix #1573. 2014-04-20 13:22:25 +02:00
ccd0
823eace903 begin work on restoring comment expansion 2014-04-19 21:44:13 -07:00
ccd0
6afed0ace9 less aggressive <hr> removal; this fixes unread line bug 2014-04-19 19:46:55 -07:00
ccd0
bf45917000 Merge branch 'newnames' 
Conflicts:
	src/General/lib/post.class
 2014-04-19 16:57:17 -07:00
Zixaphir
26f491a0cc Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2014-04-19 16:54:50 -07:00
ccd0
4f8b640e2c preserve hash when removing slugs 2014-04-19 16:26:37 -07:00
Mayhem
0280214f43 Fix file text building, and spoiler filename parsing. 2014-04-20 01:19:53 +02:00
ccd0
2d5b1646ca remove slugs, at least until moot fixes his HTML 2014-04-19 16:10:05 -07:00
ccd0
480f0e295e disable this piece of CSS entirely for now 2014-04-19 15:59:57 -07:00
ccd0
2848580ca4 remove unwanted hr 2014-04-19 15:59:13 -07:00
Mayhem
aa7cf349e8 Fix filename parsing. Close #1568 2014-04-20 00:58:31 +02:00
ccd0
ec03ab524d Merge branch 'page1' 2014-04-19 15:28:56 -07:00
ccd0
ac3b09e385 small improvements to file info parsing 2014-04-19 11:24:09 -07:00
ccd0
a54957689a better filename parsing; should fix conflict with Exlinks 2014-04-19 10:41:22 -07:00
ccd0
7aeb46abb9 transition to new HTML 2014-04-19 00:28:19 -07:00
ccd0
a7695e3f4b default keybinds conflicted with text selection 2014-04-13 17:44:13 -07:00
ccd0
a452b732fd change res -> thread in JSON API URLs 2014-04-13 01:46:18 -07:00
ccd0
c5b06f6988 Merge branch 'page1' into newnames 2014-04-13 01:38:24 -07:00
ccd0
9fe486d637 Merge branch 'master' into page1 2014-04-13 01:19:02 -07:00
ccd0
9b90698d59 move page list hiding to CSS 2014-04-12 23:58:57 -07:00
ccd0
93178c2967 fix hiding of icons outside header when icons in header are disabled 2014-04-12 23:50:04 -07:00
ccd0
6c3a0619f6 remove src, thumb from image links 2014-04-12 21:57:40 -07:00
ccd0
a5eb42e14b Merge branch 'page1' into newnames 2014-04-12 21:29:52 -07:00
ccd0
6bcf07ece6 Merge branch 'master' into page1 2014-04-12 21:29:29 -07:00
ccd0
c0ea6f8e95 update quote link regexp to accept /thread/ 2014-04-12 21:28:31 -07:00