630 Commits

Author SHA1 Message Date
Zixaphir
522d5476d8 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2013-07-25 14:53:26 -07:00
Zixaphir
22fde6fdb0 Fix quotelinks inside of resurrected posts
@MayhemYDG
2013-07-25 14:51:30 -07:00
Zixaphir
086b93f189 Release appchan x v2.2.0. 2013-07-25 13:05:24 -07:00
Zixaphir
cbb720dd22 Change that error message. 2013-07-24 22:31:22 -07:00
Zixaphir
a6d05a6115 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-07-24 22:17:35 -07:00
Zixaphir
d01c811fe2 Another indexOf I missed. 2013-07-24 22:06:08 -07:00
Zixaphir
dd4d979276 Still being different for the sake of being difficult 2013-07-24 22:01:48 -07:00
Zixaphir
0ac6747810 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	json/archives.json
	src/General/Main.coffee
2013-07-24 21:55:26 -07:00
Zixaphir
44a2b378ca Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Posting/QuickReply.coffee
2013-07-24 21:49:24 -07:00
seaweedchan
979694a973 Release 4chan X v1.2.24. 2013-07-24 02:12:15 -07:00
seaweedchan
2a23975646 Release 4chan X v1.2.23. 2013-07-23 23:23:59 -07:00
seaweedchan
c34f6693cb Release 4chan X v1.2.22. 2013-07-23 01:54:28 -07:00
Jordan Bates
46f4b5325d Release 4chan X v1.2.21. 2013-07-22 08:55:30 -07:00
Jordan Bates
07cb9074e0 Better error message
Close #96
2013-07-22 08:52:18 -07:00
Jordan Bates
c9ec6b5497 Fix #113 2013-07-22 08:38:49 -07:00
Jordan Bates
cc86e47bab Release 4chan X v1.2.20. 2013-07-22 08:16:02 -07:00
Jordan Bates
caadc68c72 Build 2013-07-22 08:13:51 -07:00
Jordan Bates
3e35ced05e Fix captcha caching across threads 2013-07-22 07:52:02 -07:00
seaweedchan
784eccd953 Fix flags 2013-07-22 06:19:08 -07:00
Zixaphir
16b35dffce Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Globals.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/General/css/style.css
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-07-21 09:01:27 -07:00
Zixaphir
d2bcf840ff Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
2013-07-21 08:43:58 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
Jordan Bates
b3db117d71 Make pointer event removal more specific 2013-07-15 19:33:40 -07:00
Jordan Bates
d65fd4e376 No pointer events for scroll marker 2013-07-15 08:04:33 -07:00
Jordan Bates
9ba459ea8a Release 4chan X v1.2.19. 2013-07-14 03:58:01 -07:00
Zixaphir
4d194382c0 Ad fading 2013-07-07 13:08:42 -07:00
Zixaphir
3851be3898 HAEY KCUF! SMARTSHIFT! 2013-07-06 14:20:11 -07:00
Zixaphir
80b60dfa84 Fix flags on /sp/. 2013-07-05 11:03:55 -07:00
Zixaphir
cf6c3cfd75 Block adpleas 2013-07-04 16:21:31 -07:00
Zixaphir
5e62562577 Was causing icons not to load 2013-07-03 02:25:31 -07:00
Zixaphir
e197195ca5 Unnecessary. 2013-07-03 02:07:46 -07:00
Zixaphir
18e3569194 Meh, really 2013-07-03 02:04:49 -07:00
Zixaphir
5ab152ee34 Small simplification 2013-07-03 02:01:41 -07:00
Jordan Bates
36bc01469b Release 4chan X v1.2.18. 2013-06-27 07:28:25 -07:00
Zixaphir
453ec634c7 Allow Style.matrix to handle one or two values 2013-06-21 00:54:52 -07:00
Zixaphir
cf6032084c Fix mascot silhouette filter
Now generates actual silhouettes.
2013-06-21 00:47:56 -07:00
Zixaphir
27c6f07913 Let's be better than we are
Should fix some padding issues, optimize theme editting, and a
bit of other stuff that's hard to remember.
2013-06-21 00:11:10 -07:00
Zixaphir
6ddfc0d5a6 Fix "New Theme" button. Close #367 2013-06-20 21:39:51 -07:00
Zixaphir
088f41b956 Some small fixes 2013-06-20 21:28:26 -07:00
Zixaphir
50084c01f6 For better or for worse, the QR is a dialog. 2013-06-20 21:16:13 -07:00
Zixaphir
9c494bbb0e Fix mascot positionings 2013-06-20 21:06:33 -07:00
Zixaphir
78b0e592f3 Never finished that implementation 2013-06-20 19:53:30 -07:00
Zixaphir
bddfa28665 close #365
vh yo
2013-06-20 19:48:12 -07:00
Zixaphir
8490850939 Add an option to click current mascot to switch between mascots. 2013-06-20 19:31:34 -07:00
Zixaphir
283a33c443 A lot of backpedaling here. 2013-06-20 19:20:32 -07:00
Zixaphir
ebfaaaacc4 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-06-20 17:21:01 -07:00
Zixaphir
2c7900442c Oh lawd, is that a commit? 2013-06-20 17:09:20 -07:00
seaweedchan
7a3ad22766 Require https with foolz
Close #100
2013-06-18 01:43:40 -07:00
Jordan Bates
52791e5ace Release 4chan X v1.2.17. 2013-06-17 07:32:21 -07:00
Jordan Bates
edba273868 Remove CSS that forces full images onto own line
Close #105
2013-06-17 06:52:02 -07:00