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

1071 Commits

Author SHA1 Message Date
Zixaphir
68bc40cc45 Merge branch 'v3' 
Conflicts:
	src/Images/FappeTyme.coffee
 2013-12-16 14:12:42 -07:00
Zixaphir
0033c5370f Don't make last minute changes without testing. ;__; 2013-12-16 14:11:15 -07:00
Zixaphir
b7d6fa2659 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
 2013-12-16 14:05:03 -07:00
Zixaphir
0e1b8c099c Forgot a return 
Also consistency.
 2013-12-16 14:03:30 -07:00
Zixaphir
e156cc8e9c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
 2013-12-16 14:01:47 -07:00
Zixaphir
0cafd9ae61 Merge @mahkoh's embedding fixes 2013-12-16 13:45:56 -07:00
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
33bc02d8b0 Release appchan x v2.6.4. 2013-12-06 17:31:20 -07:00
Zixaphir
e5e8d3b564 Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
 2013-12-06 17:29:47 -07:00
Zixaphir
8b14d8bd8f Fix header positions 2013-12-06 17:22:47 -07:00
Zixaphir
6c47fb300a Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
 2013-12-06 17:20:48 -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
Zixaphir
30b6c08922 Release appchan x v2.6.3. 2013-11-27 17:36:31 -07:00
Zixaphir
12adc14ea0 Release appchan x v2.6.2. 2013-11-27 17:18:16 -07:00
Zixaphir
33c8bdc32d Release appchan x v2.6.1. 2013-11-27 17:04:13 -07:00
Zixaphir
89910d43c5 Release appchan x v2.6.0. 2013-11-27 16:32:35 -07:00
Zixaphir
2f7dd5a185 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
 2013-11-26 12:22:13 -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
3ad1c6040c Redo FontAwesome stuff, I guess. 2013-11-23 13:23:36 -07:00
Zixaphir
34140232fb Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/General/lib/notice.class
	src/General/meta/metadata.js
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

worksforme.png
 2013-11-23 12:56:42 -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
Zixaphir
26fc5d81b7 Let's just remove the nodes. Seems to fix a catalog bug in Chrome. 2013-10-28 02:06:10 -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
0224a5c0cc Release appchan x v2.5.1. 2013-10-20 00:16:05 -07:00
Zixaphir
6795148c14 Fix Infinite Scrolling on Chrome. 2013-10-20 00:15:05 -07:00
Zixaphir
dfb0ad23df Release appchan x v2.5.0. 2013-10-19 22:58:33 -07:00
Zixaphir
b2f5fbf20b Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
 2013-10-19 22:56:45 -07:00
Zixaphir
711e22f831 Be a bit closer to Mayhem's structure for the archives 2013-10-19 22:54:40 -07:00
Zixaphir
7a58008d0c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/Miscellaneous/Emoji.coffee
 2013-10-19 19:54:09 -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
966a07ca20 Infinite Scrolling 2013-10-19 19:41:49 -07:00
Zixaphir
fefe8a28a2 softTask optimizations. 2013-10-17 18:29:10 -07:00
Zixaphir
c526b89c8d Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2013-10-16 14:33:07 -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
6d9b9cef8f Fix #470 
I swear I fixed this... already?
 2013-10-14 08:29:29 -07:00
Zixaphir
9a07882566 Release appchan x v2.4.1. 2013-10-14 00:57:15 -07:00
Zixaphir
5900490e63 Release appchan x v2.4.1. 2013-10-13 17:59:58 -07:00