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

550 Commits

Author SHA1 Message Date
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
d38380254c Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-10-19 19:48:54 -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
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
Antony Derham
8aa07dba3e Added elementary icon to emoji 2013-10-15 15:40:25 +01: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
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
Mayhem
10e93091d7 {Post,Thread}::callbacks => {Post,Thread}.callbacks 2013-10-02 11:38:15 +02: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
Jordan Bates
3470929e05 Merge some mayhem changes 2013-09-19 07:27:53 -07:00
Mayhem
5ae957b0e2 Remove capcode replies-related code as it's not relevant anymore. 2013-09-19 11:53:11 +02:00
Mayhem
dcae343687 Remove some sage-related code that is not relevant anymore. 2013-09-19 11:43:50 +02:00
Mayhem
a56b6765cb Remove some /q/-only settings. 2013-09-19 09:22:24 +02:00
Zixaphir
d4a3bc8a17 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
 2013-08-24 13:57:27 -07:00
Zixaphir
50416a0aab Cleanup 2013-08-24 13:10:03 -07:00
Zixaphir
c4fdaea615 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
 2013-08-24 13:08:23 -07:00
Zixaphir
a1fe4b50b5 Oversight 2013-08-24 11:32:14 -07:00
Zixaphir
dc0b4d3d41 Keybinds, Werk Tyme, more Mayhem-X-like IDColor 2013-08-24 11:24:49 -07:00
Mayhem
de82bd3e45 Give CS loops a hand. 2013-08-23 15:34:42 +02:00
Mayhem
b394a81494 Adjust the color ID contrast threshold. 
Totally not arbitrary edition.
 2013-08-23 02:31:23 +02:00
NoneGiven
cb498db8df Typo 
It just werx
 2013-08-23 02:04:19 +02:00
noface
01146f85c5 Close #1255. 2013-08-23 01:04:44 +02:00
Zixaphir
e80797a0fb Separate icons and "stats" in the shortcuts element 2013-08-21 11:26:48 -07:00
Zixaphir
3e2bfee617 Pretty much finish up the Gallery 2013-08-20 09:04:56 -07:00
Zixaphir
1cf8b0fe9e Werk Tyme 2013-08-20 01:11:32 -07:00
Zixaphir
7d626b9cb8 Get "slideout" UI working. 2013-08-20 00:20:29 -07:00
Zixaphir
1facbe7dc1 Get Flex actually working 2013-08-19 09:06:31 -07:00
Zixaphir
eb12134f6c It continues~ 2013-08-19 04:35:06 -07:00
Zixaphir
a730a0bc17 Start IconPositioner rewrite 2013-08-19 02:21:51 -07:00
noface
202d7617e3 Add Linkification. 2013-08-18 20:53:08 +02:00
Zixaphir
72e3fc2585 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/favicons/xat-/unreadDead.png
	src/General/img/favicons/xat-/unreadDeadY.png
	src/General/img/favicons/xat-/unreadNSFW.png
	src/General/img/favicons/xat-/unreadNSFWY.png
	src/General/img/favicons/xat-/unreadSFW.png
	src/General/img/favicons/xat-/unreadSFWY.png
	src/General/meta/banner.js
	src/General/meta/metadata.js
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
 2013-08-18 11:17:07 -07:00
Zixaphir
d15f8ee728 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	css/style.css
	html/Posting/QR.html
	img/changelog/3.2.0/0.png
	package.json
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Notice.coffee
	src/General/Notification.coffee
	src/General/Settings.coffee
	src/General/img/icon.gif
	src/General/lib/notification.class
	src/Monitoring/Favicon.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
 2013-08-17 20:33:48 -07:00
Jordan Bates
c655bbcceb Zixaphir is a tough boss 2013-08-16 16:45:22 -07:00
seaweedchan
61b2a51836 More optimizations 2013-08-16 05:30:10 -07:00
seaweedchan
2dedd6af1d Just in case 2013-08-16 02:47:35 -07:00
seaweedchan
109699d83a More optimizations + changelog 2013-08-16 02:24:24 -07:00
seaweedchan
15db317896 Limit to parent 2013-08-16 02:10:25 -07:00
seaweedchan
daf05e895d Optimizations 2013-08-16 02:07:05 -07:00
seaweedchan
40efb3cbc7 Redundancies 2013-08-16 02:00:41 -07:00
seaweedchan
4e03f88c39 Add file 2013-08-16 01:54:30 -07:00
Zixaphir
bc501dc022 Merge branch 'v3' 
Conflicts:
	.gitignore
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/ImageExpand.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
 2013-08-15 23:02:54 -07:00
Zixaphir
9d5ef234e9 Fix ToggleBarVisibility keybind 2013-08-15 20:05:46 -07:00
Zixaphir
4a4dbae492 Small optimizations to color user ids 2013-08-15 19:53:06 -07:00
Jordan Bates
5e5c81a576 Fix #146 2013-08-15 19:22:25 -07:00
Mayhem
10c8ccc90d Update prettyPrinting support. 2013-08-14 15:46:15 +02:00
seaweedchan
2fcbe0bf30 Merge Zixaphir X 2013-08-14 03:12:10 -07:00
Zixaphir
1f011dfd02 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	html/General/Header.html
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
 2013-08-14 03:02:03 -07:00