ccd0
80b2eae41b
css fix
...
Conflicts:
builds/4chan-X.user.js
builds/crx/script.js
2014-04-06 16:03:03 -07:00
Zixaphir
7818dec073
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
package.json
src/General/Index.coffee
src/Images/ImageHover.coffee
2014-04-06 11:49:45 -07:00
ccd0
31eac580aa
implement duckness's upgrade nag disabling option
2014-04-06 10:17:26 -07:00
ccd0
e1c9330250
get new hover working in catalog
2014-04-05 21:59:29 -07:00
ccd0
904af13063
better approach to hover css
2014-04-05 20:11:38 -07:00
ccd0
f88883887a
css fix
2014-04-05 18:46:18 -07:00
ccd0
782fd7ad05
Merge branch 'v3' of https://github.com/zixaphir/appchan-x
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
2014-04-05 18:21:07 -07:00
ccd0
dcda06c40c
Merge commit '4b2862641095ffe5a25514fcc82458c72c601543' of https://github.com/zixaphir/appchan-x
...
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
2014-04-05 17:36:35 -07:00
ccd0
730f275406
remove unneeded entry from feature initialization list
2014-04-05 14:20:18 -07:00
Mayhem
a65c724cfb
Fix #1536
2014-04-05 14:03:32 +02:00
Mayhem
20846ad4fe
Fix #1511
2014-04-05 13:40:54 +02:00
ccd0
342672bab3
implement length 1 queue of videos to be deleted
2014-04-04 22:11:17 -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
f6898b8c03
Change some things around
2014-04-04 17:05:53 -07:00
Zixaphir
11b699a0b6
Damn typos.
2014-04-04 16:27:37 -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
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
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
