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

291 Commits

Author SHA1 Message Date
Zixaphir
b46e61a8d5 Release appchan x v2.7.2. 2013-12-25 20:38:30 -07:00
Zixaphir
996080cab9 Merge branch 'v3' 
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Menu/Menu.coffee
	src/Posting/QR.coffee
 2013-12-25 11:23:41 -07:00
Zixaphir
6dd2e60e9a Element.contains was not Array.contains, lol 2013-12-25 10:10:51 -07:00
Zixaphir
147808a7d4 Release appchan x v2.7.1. 2013-12-24 16:53:43 -07:00
Zixaphir
ae789f4ad8 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/Posting/QuickReply.coffee
 2013-12-24 16:18:47 -07:00
Zixaphir
91233b8d61 remove [].contains. It was a bad idea. 
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
 2013-12-24 14:41:21 -07:00
Zixaphir
cfb883d8da Alternative text for Refresh Shortcut. seaweedchan/4chan-x#212 
DUH, I DUMB
 2013-12-21 19:29:22 -07:00
Zixaphir
d7ceb42446 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/font-awesome.css
	src/Miscellaneous/CatalogLinks.coffee
 2013-12-18 16:17:11 -07:00
Zixaphir
5d6b357135 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
	src/General/lib/post.class
 2013-12-18 12:21:43 -07:00
Zixaphir
c36d62d5ce Cleanup and fix remaining issues from seaweedchan/4chan-x#212 2013-12-18 12:15:13 -07:00
Zixaphir
1c55dbd8aa Release appchan x v2.7.0. 2013-12-16 20:21: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
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
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
6c47fb300a Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
 2013-12-06 17:20:48 -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
16e2afa916 Update for moot's markup change, close #213 2013-12-06 16:57:35 -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
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
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
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
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
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
Zixaphir
add2019705 Release appchan x v2.4.0. 2013-10-13 15:17:25 -07:00
Zixaphir
904316e4e0 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
 2013-10-13 14:42:58 -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
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
7812001d96 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
	src/Posting/QuickReply.coffee
 2013-09-24 14:46:24 -07:00