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

668 Commits

Author SHA1 Message Date
Brandon
ee3f2347af fix #703 2014-04-21 13:15:25 -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
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
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
ea47aefd93 Merge branch 'v3' 
Conflicts:
	.gitignore
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Settings.html
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadWatcher.coffee
 2014-04-11 00:29:52 -07:00
Zixaphir
a3845d843b Release appchan x v2.9.15. 2014-04-05 05:40:46 -07:00
Zixaphir
e5230e6457 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
 2014-04-05 05:39:32 -07:00
Zixaphir
81eb21797e Release appchan x v2.9.14. 2014-04-05 05:33:40 -07:00
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
6760dcf09f Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-05 01:03:36 -07:00
Zixaphir
af843c0c6d Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-05 00:47:29 -07:00
Zixaphir
ef886aea7f Merge fail. 2014-04-04 20:50:30 -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
ca287336b1 Release appchan x v2.9.12. 2014-04-04 17:32:20 -07:00
Zixaphir
4a26b5ea14 Firefox doesn't seem to like displaying videos as blocks? 2014-04-04 17:28:44 -07:00
Zixaphir
66f449cced Cleanup 2014-04-04 17:11:41 -07:00
Zixaphir
f6898b8c03 Change some things around 2014-04-04 17:05:53 -07:00
Zixaphir
276a08d6e6 iHover is now a class 2014-04-04 16:15:07 -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
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
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
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
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
Zixaphir
1f9d5e2221 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-02 19:17:49 -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
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
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
0ad639c4a9 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-26 15:21:29 -07:00
Zixaphir
8b68243650 Merge branch 'v3' 2014-03-24 13:34:50 -07:00
Zixaphir
854c588820 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-24 13:31:42 -07:00
Zixaphir
53db0118a3 Compact File Text 2014-03-23 18:41:26 -07:00
Zixaphir
fe7d37196f Merge branch 'v3' 
Also add Backlink Icons from OneeChan

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-23 18:25:34 -07:00