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

1465 Commits

Author SHA1 Message Date
Zixaphir
dbf47f0748 Extensions on the Chrome Webstore don't use updates.xml 2014-04-04 16:03:22 -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
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
ccd0
07d5b9eeb8 global sound option 2014-04-04 15:35:16 -07:00
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02:00
ccd0
26576b4420 video hover 2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a add video expansion 2014-04-04 11:56:10 -07:00
ccd0
3fa34d3e69 fix updates.xml 2014-04-03 16:29:35 -07:00
ccd0
f53752c20c use gh-pages for updates 2014-04-03 15:59:40 -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
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
7f3d330ba4 Add updater for Chrom* extension. 2014-04-03 14:03:05 -07: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
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
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
f6ea1ed52c Don't clean empty data. 2014-03-26 11:16:05 -07:00
ccd0
4f260137f1 embed direct video links 2014-03-25 00:50:41 -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
e20a822481 Since we already are generating keys, lets use them. 2014-03-23 17:46:21 -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
55e43147ed Redundant 2014-03-23 12:32:40 -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
4c09eed4cd Holy shit loops 2014-03-21 16:35:27 -07:00
Zixaphir
4c52d0ee05 comments 2014-03-20 15:19:24 -07:00
Zixaphir
2ac35d9fc8 Move userMascots and userThemes out of Sync storage. 
lelwat
 2014-03-20 11:17:17 -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
282a2338d8 One more thing from master branch 2014-03-20 09:55:32 -07:00
Zixaphir
18db3994b6 Backport fixes from master branch 2014-03-20 09:37:27 -07:00
Mayhem
d1a305a888 Hide and don't use the header hitzone when unnecessary. 2014-03-20 16:21:22 +01:00
Zixaphir
44f778c754 For real this time, fix that shit. 2014-03-19 08:39:35 -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
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
99babc304a Oops 2014-03-14 17:29:02 -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
be4be5a94b Fix post fetching 2014-03-14 17:08:00 -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
ca9abdc4e7 Remove Main.callbacknodes 2014-03-14 16:02:19 -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