252 Commits

Author SHA1 Message Date
Zixaphir
6f84ae9abe Start merging ccd0's 4chan X stuff 2015-01-08 13:53:38 -07:00
Zixaphir
2dbe9c7587 Release appchan x v2.9.43. 2014-12-14 00:23:05 -07:00
Zixaphir
004448310c Release appchan x v2.9.42. 2014-12-13 04:47:17 -07:00
Zixaphir
5ef060529c Release appchan x v2.9.41. 2014-12-12 04:04:55 -07:00
Zixaphir
9dc81e8ae4 Release appchan x v2.9.40. 2014-12-09 06:21:36 -07:00
Zixaphir
7dd888e2a5 Release appchan x v2.9.39. 2014-12-09 00:32:07 -07:00
Zixaphir
7b1183edb8 Release appchan x v2.9.38. 2014-10-27 15:13:46 -07:00
Zixaphir
2fad771b94 Release appchan x v2.9.37. 2014-10-01 17:41:30 -07:00
Zixaphir
04711305be Release appchan x v2.9.36. 2014-09-07 16:02:51 -07:00
Zixaphir
0006854dac Release appchan x v2.9.35. 2014-08-24 15:52:05 -07:00
Zixaphir
cf429047e9 Release appchan x v2.9.34. 2014-08-18 18:05:52 -07:00
Zixaphir
f5281bfe54 Release appchan x v2.9.33. 2014-07-31 23:26:02 -07:00
Zixaphir
51d6907c68 Release appchan x v2.9.32. 2014-07-28 15:07:26 -07:00
Zixaphir
2e3a433fc0 Release appchan x v2.9.31. 2014-07-18 00:22:33 -07:00
Zixaphir
e11ba88cff Release appchan x v2.9.30. 2014-06-22 08:41:19 -07:00
Zixaphir
b94ebd5d83 Release appchan x v2.9.29. 2014-05-29 10:39:09 -07:00
Zixaphir
718513e5ef Release appchan x v2.9.28. 2014-05-27 18:46:46 -07:00
Zixaphir
e4a5701a91 Release appchan x v2.9.27. 2014-05-27 12:43:41 -07:00
Zixaphir
938acfe5d8 Release appchan x v2.9.26. 2014-05-07 23:25:13 -07:00
Zixaphir
fd2992c831 Release appchan x v2.9.25. 2014-05-05 19:36:50 -07:00
Zixaphir
037a134361 Release appchan x v2.9.24. 2014-05-04 05:08:15 -07:00
Zixaphir
24c45abf25 Release appchan x v2.9.23. 2014-05-03 16:26:12 -07:00
Zixaphir
2b2b032f1b Release appchan x v2.9.22. 2014-05-03 07:10:47 -07:00
Zixaphir
af9ea192de Release appchan x v2.9.21. 2014-05-03 06:48:02 -07:00
Zixaphir
05b18da991 Release appchan x v2.9.20. 2014-04-20 08:31:51 -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
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
Zixaphir
33943a06eb Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Build.coffee
	src/General/Main.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Monitoring/ThreadUpdater.coffee
2014-04-12 18:13:21 -07:00
Zixaphir
4b3f4d1baf Merge branch 'ccd0' into v3
Conflicts:
	builds/crx.crx
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
2014-04-12 18:02:25 -07:00
ccd0
8a5cd7a610 Release 4chan X v1.7.8. 2014-04-12 10:00:46 -07:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
2014-04-10 23:08:43 -07:00
ccd0
2064baa227 Release 4chan X v1.7.7. 2014-04-10 08:59:12 -07:00
ccd0
2889c17e32 Release 4chan X v1.7.6. 2014-04-10 01:40:53 -07:00
ccd0
d7ba6cf31d Release 4chan X v1.7.5. 2014-04-09 03:04:15 -07:00
ccd0
cde38b64dd Release 4chan X v1.7.4. 2014-04-08 20:11:23 -07:00
Zixaphir
b00390b980 Merge branch 'ccd0' into v3
Rebase ImageExpand implemention off ccd0's

Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/Images/ImageExpand.coffee
2014-04-08 14:46:15 -07:00
ccd0
1dc57bda8f Release 4chan X v1.7.3. 2014-04-07 22:03:46 -07:00
Zixaphir
d215221c71 Merge branch 'ccd0' into v3
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/Miscellaneous/ExpandThread.coffee
2014-04-07 11:26:21 -07:00
ccd0
a35f547cdd Release 4chan X v1.7.2. 2014-04-07 03:40:08 -07:00
ccd0
d3397a952c Release 4chan X v1.7.1. 2014-04-06 23:59:30 -07:00
Zixaphir
68a76a25f2 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
	src/General/UI.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
2014-04-06 20:47:38 -07:00
ccd0
711c4587da Release 4chan X v1.7.0. 2014-04-06 16:25:39 -07:00
ccd0
11c721a056 Skipping 4chan X v1.6.0.
Conflicts:
	CHANGELOG.md
2014-04-06 16:13:57 -07:00
ccd0
3836813e07 Release 4chan X v1.6.0. 2014-04-06 10:23:24 -07:00
ccd0
dcda06c40c Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-05 17:36:35 -07:00
Zixaphir
a3845d843b Release appchan x v2.9.15. 2014-04-05 05:40:46 -07:00
Zixaphir
81eb21797e Release appchan x v2.9.14. 2014-04-05 05:33:40 -07:00