598 Commits

Author SHA1 Message Date
Zixaphir
eb91edaf6d Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
2014-04-05 05:33:14 -07:00
Zixaphir
616b2fbc2a Release appchan x v2.9.13. 2014-04-05 01:11:06 -07:00
Zixaphir
453ebe7e74 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
2014-04-04 20:28:21 -07:00
Zixaphir
f6353729eb Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee
2014-04-04 20:24:12 -07:00
Zixaphir
ca287336b1 Release appchan x v2.9.12. 2014-04-04 17:32:20 -07:00
Zixaphir
8536ae3d37 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
2014-04-04 16:12:31 -07:00
Zixaphir
4b28626410 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageHover.coffee
	src/Posting/QR.coffee
2014-04-04 16:10:07 -07:00
Zixaphir
6dcbb80070 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
2014-04-04 16:01:06 -07:00
Zixaphir
db7e039b88 Changelog 2014-04-04 15:50:36 -07:00
ccd0
12feb7dc9b Release 4chan X v1.5.1. 2014-04-04 15:43:53 -07:00
Zixaphir
e4c395a7cd Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
2014-04-04 15:41:15 -07:00
Mayhem
f04f411018 Release 4chan X v3.20.0. 2014-04-05 00:35:50 +02:00
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02:00
ccd0
3e6dfea6ae Release 4chan X v1.5.0. 2014-04-04 13:37:08 -07:00
Zixaphir
9be60fdbb8 Release appchan x v2.9.11. 2014-04-03 16:56:49 -07:00
ccd0
1d6d0518a3 Release 4chan X v1.4.7. 2014-04-03 16:43:10 -07:00
Zixaphir
b662cf2366 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/css/style.css
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-03 15:19:41 -07:00
ccd0
1aed06b412 Release 4chan X v1.4.6. 2014-04-03 15:00:41 -07:00
Zixaphir
4756274a73 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Posting/QR.coffee
2014-04-03 14:58:07 -07:00
Zixaphir
46478eb4d0 Merge branch 'duckness' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-03 14:52:55 -07:00
ccd0
1832f124c8 Update archives with data from MayhemYDG fork 2014-04-03 14:52:25 -07:00
ccd0
f6dece4b80 Release 4chan X v1.4.5. 2014-04-03 14:07:56 -07:00
ccd0
7f3d330ba4 Add updater for Chrom* extension. 2014-04-03 14:03:05 -07:00
ccd0
45d3ea8cc8 update CHANGELOG.md 2014-04-03 13:28:30 -07:00
ccd0
6c06100f23 Release 4chan X v1.4.4. 2014-04-03 12:52:24 -07:00
ccd0
798b2bf2e4 Release 4chan X v1.4.3. 2014-04-03 05:11:01 -07:00
ccd0
bf6e918d0d Release 4chan X v1.4.2. 2014-04-02 21:47:46 -07:00
ccd0
58b2c2d4ac Update CHANGELOG.md 2014-04-02 18:55:44 -07:00
Mayhem
fd703d42ba Fix captchas, again. #1531
Conflicts:
	CHANGELOG.md
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-02 17:51:14 -07:00
Zixaphir
66582d5ce9 Release appchan x v2.9.10. 2014-04-02 17:21:38 -07:00
Zixaphir
9f7026e419 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Posting/QR.captcha.coffee
2014-04-02 17:21:16 -07:00
Zixaphir
8f62341949 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-04-02 17:12:15 -07:00
Mayhem
a4bd81de54 Release 4chan X v3.19.5. 2014-04-03 01:47:47 +02:00
Mayhem
7bc7aed998 Fix captchas, again. #1531 2014-04-03 01:47:38 +02:00
Zixaphir
36aac79a2b Release appchan x v2.9.9. 2014-03-27 13:55:24 -07:00
Zixaphir
df2a5f3fc0 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-27 13:55:02 -07:00
Zixaphir
cefb710c04 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Header.coffee
2014-03-27 13:50:02 -07:00
Mayhem
c5dfd248e6 Release 4chan X v3.19.4. 2014-03-27 21:31:58 +01:00
Mayhem
825236a002 Fix #1524. 2014-03-27 21:31:16 +01:00
Zixaphir
b093395413 Release appchan x v2.9.8. 2014-03-26 15:33:28 -07:00
Zixaphir
34dd4ba96a Merge branch 'v3'
Conflicts:
	CHANGELOG.md
2014-03-26 15:32:57 -07:00
Zixaphir
1afcdd011c Improve Scroll to Post Quoting You logic 2014-03-26 15:31:26 -07:00
Zixaphir
1b5095ac24 Release appchan x v2.9.7. 2014-03-20 15:21:24 -07:00
Mayhem
2930df7098 Release 4chan X v3.19.3. 2014-03-20 16:33:49 +01:00
Mayhem
c1a7fcd90b Changelog. 2014-03-20 16:33:42 +01:00
Zixaphir
a48357a45f Release appchan x v2.9.6. 2014-03-19 08:42:47 -07:00
Zixaphir
07a12bbd2f Release appchan x v2.9.5. 2014-03-15 15:39:16 -07:00
Zixaphir
697afe0067 Release appchan x v2.9.4. 2014-03-14 19:14:01 -07:00
Zixaphir
e459069ae6 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/InfiniScroll.coffee
	src/Posting/QR.coffee
2014-03-13 18:12:44 -07:00
Zixaphir
9b9a2980aa Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	README.md
	css/style.css
	html/General/Header.html
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
2014-03-13 14:30:39 -07:00