7093 Commits

Author SHA1 Message Date
Zixaphir
9be60fdbb8 Release appchan x v2.9.11. 2014-04-03 16:56:49 -07:00
Zixaphir
b18edaa764 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-04-03 16:25:45 -07:00
Zixaphir
523482cfcd Fix Link Title 2014-04-03 16:25:07 -07:00
Zixaphir
4d46c17073 Merge branch 'vampiric' 2014-04-03 15:33:39 -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
Zixaphir
27b745ce7d Smart 2014-04-03 15:06:48 -07:00
Zixaphir
6df7f1c4da Small flags input reflow 2014-04-03 15:05:36 -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
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
aa00f8f6f5 fix inclusion of undesired files by build script 2014-04-03 12:15:32 -07:00
ccd0
b2787128e1 fix flag input field removal 2014-04-03 12:10:32 -07:00
Bjorn Lim
b016db3f4f Merge pull request #2 from ccd0/nobump
fix navigation bug
2014-04-03 20:43:57 +08:00
ccd0
d943bf5024 fix navigation bug
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-03 05:15:22 -07:00
ccd0
798b2bf2e4 Release 4chan X v1.4.3. 2014-04-03 05:11:01 -07:00
ccd0
6780ef629d fix navigation bug 2014-04-03 04:55:31 -07:00
Bjorn Lim
894682f067 Merge pull request #1 from ccd0/nobump
fix new captcha issue
2014-04-03 18:23:11 +08:00
ccd0
bf6e918d0d Release 4chan X v1.4.2. 2014-04-02 21:47:46 -07:00
Brandon
d9ea888d6f centering tab on slideup 2014-04-02 21:09:22 -07:00
Brandon
3d4e0338fe Zixa making fun of me 2014-04-02 20:58:46 -07:00
Brandon
541c8270ea More magic happens to the tabbed slideup 2014-04-02 20:52:12 -07:00
Brandon
dd8ba9f6b1 slideup fixup 2014-04-02 20:49:25 -07:00
Brandon
fd840d822c QR Slideup and Tabbed Slideup
* upstream/master:
  move that where it belongs
  fix uploading swfs on /f/
  Release appchan x v2.9.10.
  Release 4chan X v3.19.5.
  Fix captchas, again. #1531
  Lets just build that so that we don't have to do so many logic checks
  Lets pretend we're smarter than we really are!

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-04-02 20:12:35 -07:00
ccd0
0366d9baaa pack chrome version 2014-04-02 19:41:36 -07:00
Zixaphir
1f9d5e2221 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-04-02 19:17:49 -07:00
Brandon
9c11798308 move that where it belongs
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-02 19:17:19 -07:00
Brandon
0d34429ee0 fix uploading swfs on /f/
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-02 19:16:51 -07:00
ccd0
58b2c2d4ac Update CHANGELOG.md 2014-04-02 18:55:44 -07:00
ccd0
1e368876e7 make links in README relative 2014-04-02 18:22:33 -07:00
ccd0
3583ffaefd compile after merge 2014-04-02 18:04:58 -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
ccd0
5c0223de50 compile after merge 2014-03-31 21:38:11 -07:00
ccd0
4cba926baf Merge branch 'master' of https://github.com/duckness/4chan-x 2014-03-31 21:32:04 -07:00
ccd0
9193c3e0f1 fix wrongly embedded links with dummy types 2014-03-31 21:20:12 -07:00
Zixaphir
bbc8899cf1 Lets just build that so that we don't have to do so many logic checks 2014-03-30 18:24:42 -07:00
Zixaphir
393eb3ec22 Lets pretend we're smarter than we really are! 2014-03-30 16:53:08 -07:00
duckness
d8ca3bcafc Update 4chan-X.user.js
added changes from MayhemYDG to solve captcha issue
2014-03-29 18:48:14 +08:00
Bjorn Lim
2b16fa924f Update QR.captcha.coffee
added changes from MayhemYDG to solve captcha issue
2014-03-29 18:18:51 +08: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
af9e544141 Corrections 2014-03-27 13:53:21 -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