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

648 Commits

Author SHA1 Message Date
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
Zixaphir
528e5667ef Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-23 14:33:16 -07:00
Zixaphir
5e21c32a4a Fuck protocols. 2014-03-22 12:32:06 -07:00
Zixaphir
7aafc89cb8 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-21 16:36:41 -07:00
Zixaphir
1b5095ac24 Release appchan x v2.9.7. 2014-03-20 15:21:24 -07:00
Zixaphir
d495c74aef Eliminate a worthless console error 2014-03-20 10:04:10 -07:00
Zixaphir
d45f737603 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/Linkification/Linkify.coffee
 2014-03-20 09:57:27 -07:00
Zixaphir
3b611160ac Eliminate title cacheing for the time being. 
Causing too many problems.
Also attempt to optimize Linkify.
 2014-03-20 09:03:56 -07:00
Zixaphir
a48357a45f Release appchan x v2.9.6. 2014-03-19 08:42:47 -07:00
Zixaphir
44f778c754 For real this time, fix that shit. 2014-03-19 08:39:35 -07:00
Zixaphir
f5c9927914 Actually prune cached video titles 2014-03-19 08:06:52 -07:00
Zixaphir
ca45ed6fe1 Typo 2014-03-19 07:47:22 -07:00
Zixaphir
3174af1c50 Fix an issue causing duplicate backlinks to be generated 
Actually, it caused a lot of issues, but that was a big one.
 2014-03-19 07:38:37 -07:00
Zixaphir
07a12bbd2f Release appchan x v2.9.5. 2014-03-15 15:39:16 -07:00
Zixaphir
e499adf735 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-15 15:37:03 -07:00
Zixaphir
697afe0067 Release appchan x v2.9.4. 2014-03-14 19:14:01 -07:00
Zixaphir
6e03bb150e Due to popular request, restore the catalog button. 2014-03-14 18:59:05 -07:00
Zixaphir
823f09634f Merge branch 'v3' 2014-03-14 17:29:25 -07:00
Zixaphir
f903abd165 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-14 17:09:32 -07:00
Zixaphir
b19149cd15 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-14 16:03:17 -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