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

1931 Commits

Author SHA1 Message Date
Zixaphir
7514ff41d4 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
 2014-05-03 06:39:09 -07:00
Zixaphir
fd76d85c07 Invalid string 2014-05-03 06:37:49 -07:00
Zixaphir
9d3ad61925 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-05-03 06:29:56 -07:00
Zixaphir
7375484693 Some misses 2014-05-03 06:27:49 -07:00
Zixaphir
c04c83f915 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Theming/Banner.coffee
 2014-05-03 06:20:04 -07:00
Zixaphir
e8a3f65c5f Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2014-05-03 06:09:14 -07:00
Zixaphir
0fdeae4e77 Consolidate dimension-check code into QR.post. 
Reduces redundant generation of video/image elements for thumbnail
generation and dimension check code by merging them into one routine
 2014-05-03 06:05:28 -07:00
Zixaphir
7f01817977 Missed one 2014-05-03 03:37:04 -07:00
Zixaphir
ec77ec1e84 QuoteYou > QuoteMarkers 2014-05-03 03:35:33 -07:00
Zixaphir
47a726daca I don't know why this was changed. Long filenames are shit. 2014-05-03 02:52:39 -07:00
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
2731e3c6eb Fat arrows aren't needed here 2014-05-03 02:16:53 -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
ccd0
f6a5fce277 Release 4chan X v1.7.27. 2014-05-02 16:19:30 -07:00
ccd0
1174430791 Release 4chan X v1.7.26. 2014-05-02 12:39:09 -07:00
Brandon
663f1664e9 fix #704 
hopefully this didn’t break anything else.
 2014-05-02 11:21:53 -07:00
Brandon
92fd727b30 minor fix 2014-05-02 10:53:14 -07:00
ccd0
f7554f3a05 Release 4chan X v1.7.25. 2014-05-01 03:39:24 -07:00
ccd0
4cb318120b Release 4chan X v1.7.24. 2014-04-30 01:20:04 -07:00
ccd0
d5035005fd Release 4chan X v1.7.23. 2014-04-29 04:52:38 -07:00
ccd0
7a8b39f327 Release 4chan X v1.7.22. 2014-04-27 19:19:51 -07:00
ccd0
1b33aebbb3 Release 4chan X v1.7.21. 2014-04-27 09:08:54 -07:00
ccd0
d6f9d136b0 Release 4chan X v1.7.20. 2014-04-27 00:25:02 -07:00
ccd0
0e46a564f3 Release 4chan X v1.7.19. 2014-04-25 20:52:11 -07:00
Brandon
ee3f2347af fix #703 2014-04-21 13:15:25 -07:00
ccd0
47f1b7f914 Release 4chan X v1.7.18. 2014-04-20 23:10:15 -07:00
ccd0
28838d2d63 Release 4chan X v1.7.17. 2014-04-20 16:27:54 -07:00
Zixaphir
05b18da991 Release appchan x v2.9.20. 2014-04-20 08:31:51 -07:00
Zixaphir
d5a2f609da Let's try seeing if moot will let us not have to force-disable his ads. 2014-04-20 08:28:56 -07:00
Zixaphir
1df9bab835 Force flags. 2014-04-20 08:23:29 -07:00
Zixaphir
0c9a2b9006 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-20 08:10:51 -07:00
Zixaphir
871d7820b7 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2014-04-20 07:15:14 -07:00
ccd0
512abfb205 Release 4chan X v1.7.16. 2014-04-19 22:04:28 -07:00
ccd0
253de9b2cb Release 4chan X v1.7.15. 2014-04-19 19:47:28 -07:00
ccd0
c7575822e8 Release 4chan X v1.7.14. 2014-04-19 17:27:37 -07:00
Zixaphir
3856668d42 Release appchan x v2.9.19. 2014-04-19 17:17:57 -07:00
Zixaphir
67b4905aa1 Release appchan x v2.9.18. 2014-04-19 17:10:41 -07:00
Zixaphir
e7c5a5b549 Release appchan x v2.9.17. 2014-04-19 16:58:14 -07:00
Zixaphir
03041505af Change defaults to look more like 4chan 2014-04-19 16:57:38 -07:00
Zixaphir
d74834d406 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-19 16:56:16 -07:00
Zixaphir
26f491a0cc Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
 2014-04-19 16:54:50 -07:00
ccd0
5d569321d6 Release 4chan X v1.7.13. 2014-04-19 16:12:18 -07:00
Zixaphir
fb9a61f5dc Release appchan x v2.9.16. 2014-04-19 15:48:58 -07:00
Zixaphir
41ec3933cd Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Posting/QR.coffee
 2014-04-19 15:48:11 -07:00
ccd0
1c0349c10d Release 4chan X v1.7.12. 2014-04-19 10:41:55 -07:00
ccd0
23de0c18bd Release 4chan X v1.7.11. 2014-04-19 01:58:25 -07:00
ccd0
0bdb01e08f Release 4chan X v1.7.10. 2014-04-17 17:16:59 -07:00