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

1158 Commits

Author SHA1 Message Date
Zixaphir
cc5cf4f124 Update archives 2013-12-16 13:41:12 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
 2013-12-16 12:56:09 -07:00
Zixaphir
b396ef982f Fix a couple more classes 2013-12-16 12:25:39 -07:00
Zixaphir
bdba59eccc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.coffee
	package.json
	src/Miscellaneous/Keybinds.coffee
 2013-12-09 19:00:56 -07:00
Zixaphir
8b14d8bd8f Fix header positions 2013-12-06 17:22:47 -07:00
Jordan Bates
4fd8e6a4bf Release 4chan X v1.2.44. 2013-12-06 17:11:47 -07:00
Zixaphir
adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee
 2013-12-06 17:11:36 -07:00
Jordan Bates
382943a266 Cooldown fix, from Mayhem 2013-12-06 17:09:57 -07:00
Jordan Bates
16fc57ca2d Merge mayhems fix for #214 2013-12-06 17:02:56 -07:00
Jordan Bates
16e2afa916 Update for moot's markup change, close #213 2013-12-06 16:57:35 -07:00
Zixaphir
cadbea75b2 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2013-11-26 12:19:19 -07:00
Zixaphir
407fdf745e ::before 2013-11-23 12:23:37 -07:00
Zixaphir
9f7dda70c1 Fix menu's CSS 2013-11-23 11:52:25 -07:00
Zixaphir
038a2220e7 "fix" thread updater 2013-11-23 11:22:39 -07:00
Zixaphir
7fb48b93d4 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
 2013-11-23 11:17:11 -07:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything 
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
 2013-11-22 17:25:06 -07:00
Jordan Bates
b9a0d453db Release 4chan X v1.2.43. 2013-11-10 23:36:52 -07:00
Jordan Bates
2094164ff3 Strawpoll embedding, close #206 2013-11-10 23:35:32 -07:00
Jordan Bates
528f95d5f5 Release 4chan X v1.2.42. 2013-10-22 18:27:12 -07:00
Zixaphir
739bd5d1ef Fix Infinite Scrolling on Chrome. 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2013-10-20 00:21:15 -07:00
Zixaphir
711e22f831 Be a bit closer to Mayhem's structure for the archives 2013-10-19 22:54:40 -07:00
Zixaphir
71f4bbc4de softTask optimizations. 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2013-10-19 19:46:26 -07:00
Zixaphir
4f50fd300d Infinite Scrolling 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
 2013-10-19 19:45:35 -07:00
Zixaphir
9fb8ab50e1 MediaCrush embedding (the right way?) 2013-10-16 14:31:18 -07:00
Zixaphir
6f6766b9a0 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	html/General/Settings-section-Rice.html

Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle
IDColor conflicts between Mayhem's repo and ours
 2013-10-16 13:53:47 -07:00
Zixaphir
078869679b ThreadUpdater 2013-10-13 17:32:45 -07:00
Zixaphir
d2af181dea I removed autoUpdate 2013-10-13 14:48:43 -07:00
Zixaphir
1c9db7536d Restore ThreadUpdater.count() 2013-10-13 14:44:09 -07:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
 2013-10-13 14:29:52 -07:00
Zixaphir
38010c0b26 A couple of small things 2013-10-13 13:57:36 -07:00
Zixaphir
91cedb3b89 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2013-10-13 13:53:38 -07:00
seaweedchan
26a0c27ac3 Release 4chan X v1.2.41. 2013-10-03 16:49:16 -07:00
seaweedchan
6cab2cfca7 Fix #194 2013-10-03 16:47:45 -07:00
Zixaphir
0935464e05 Just in case 2013-09-24 15:08:38 -07:00
Zixaphir
d2ae42798a Fix seaweedchan/4chan-x#172, fix seaweedchan/4chan-x#190 2013-09-24 15:03:35 -07:00
Zixaphir
5b87c17e69 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/Redirect.coffee
 2013-09-24 14:33:21 -07:00
seaweedchan
c6d5c0c463 Release 4chan X v1.2.40. 2013-09-22 04:45:33 -07:00
seaweedchan
93589e80ef Close #187 2013-09-22 04:40:37 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -07:00
Jordan Bates
37fde17277 Build and changelog 2013-09-21 10:12:25 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
 2013-09-20 05:45:04 -07:00
Zixaphir
8ba58ee12e Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2013-09-20 04:45:46 -07:00
Jordan Bates
4ee4856a78 Release 4chan X v1.2.39. 2013-09-19 11:30:50 -07:00
Jordan Bates
2a1368fb80 Fix #185 and #186 2013-09-19 11:28:22 -07:00
Jordan Bates
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Jordan Bates
56387a7162 Fix type and build 2013-09-19 07:30:42 -07:00
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Jordan Bates
85afe58c62 Close #172 2013-09-12 16:37:00 -07:00
Jordan Bates
dde6658610 Close #168 2013-09-12 16:22:07 -07:00