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 |
|
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 |
|
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 |
|
ccd0
|
4f260137f1
|
embed direct video links
|
2014-03-25 00:50:41 -07:00 |
|
Zixaphir
|
fe8c67e03e
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Navigate.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Features/Index-navlinks.html
src/Miscellaneous/CustomCSS.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteYou.coffee
|
2014-03-06 20:15:45 -07:00 |
|
Kabir Sala
|
2309634930
|
Forget image
|
2014-03-01 18:59:46 +01:00 |
|
Zixaphir
|
d11b435134
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/icon16.png
builds/crx/icon48.png
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/html/Features/QuickReply.html
src/General/img/icon16.png
src/General/img/icon48.png
src/Miscellaneous/Emoji.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
|
2014-02-16 02:17:36 -07:00 |
|
Zixaphir
|
6dd0cac797
|
Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/script.js
src/Archive/Redirect.coffee
src/General/Header.coffee
src/Monitoring/Favicon.coffee
|
2014-02-16 01:00:41 -07:00 |
|
Kabir Sala
|
3ad3af5dd9
|
Pass the images on Trimage
|
2014-02-13 18:36:31 +01:00 |
|
Kabir Sala
|
d22dceea5a
|
Add Metro favicon (why not?)
|
2014-02-10 18:00:34 +01:00 |
|
Kabir Sala
|
601312d9f6
|
Add OpenSUSE emoji
|
2014-02-10 15:44:48 +01:00 |
|
Zixaphir
|
a5126923b1
|
Switch out for my more optimized PNGs
|
2014-01-13 12:57:47 -07:00 |
|
Zixaphir
|
966882c11d
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/General/html/Settings/Advanced.html
|
2014-01-12 15:26:45 -07:00 |
|
Zixaphir
|
36826cac3e
|
Merge some old favicon changes from appchan that never made it back
to v3
|
2014-01-12 15:20:39 -07:00 |
|
Zixaphir
|
bd08bd964d
|
Merge branch 'json' into ajson
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Features/Index-navlinks.html
src/General/html/Monitoring/ThreadWatcher.html
src/Images/Gallery.coffee
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QR.coffee
|
2014-01-11 15:55:46 -07:00 |
|
Jordan
|
7eb6849276
|
Changelog
|
2014-01-08 22:16:37 -07:00 |
|
Zixaphir
|
7a58008d0c
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/appchan-x.user.js
builds/crx/script.js
src/General/Main.coffee
src/Miscellaneous/Emoji.coffee
|
2013-10-19 19:54:09 -07:00 |
|
Antony Derham
|
8aa07dba3e
|
Added elementary icon to emoji
|
2013-10-15 15:40:25 +01:00 |
|
Zixaphir
|
1df5442483
|
changelog image
|
2013-08-21 13:18:30 -07:00 |
|
Zixaphir
|
72e3fc2585
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Features/QuickReply.html
src/General/img/favicons/xat-/unreadDead.png
src/General/img/favicons/xat-/unreadDeadY.png
src/General/img/favicons/xat-/unreadNSFW.png
src/General/img/favicons/xat-/unreadNSFWY.png
src/General/img/favicons/xat-/unreadSFW.png
src/General/img/favicons/xat-/unreadSFWY.png
src/General/meta/banner.js
src/General/meta/metadata.js
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
|
2013-08-18 11:17:07 -07:00 |
|
Zixaphir
|
d15f8ee728
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
css/style.css
html/Posting/QR.html
img/changelog/3.2.0/0.png
package.json
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Notice.coffee
src/General/Notification.coffee
src/General/Settings.coffee
src/General/img/icon.gif
src/General/lib/notification.class
src/Monitoring/Favicon.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
|
2013-08-17 20:33:48 -07:00 |
|
Zixaphir
|
298b5d3270
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
builds/appchan-x.user.js
builds/crx/script.js
src/General/Config.coffee
src/General/css/style.css
|
2013-08-16 03:39:33 -07:00 |
|
seaweedchan
|
109699d83a
|
More optimizations + changelog
|
2013-08-16 02:24:24 -07:00 |
|
Zixaphir
|
bc501dc022
|
Merge branch 'v3'
Conflicts:
.gitignore
CHANGELOG.md
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/html/Monitoring/ThreadWatcher.html
src/Images/ImageExpand.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
|
2013-08-15 23:02:54 -07:00 |
|
seaweedchan
|
5a46958ab2
|
Update changelog
|
2013-08-14 05:17:43 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
c4a008f402
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/css/style.css
|
2013-05-10 07:19:08 -07:00 |
|
Jordan Bates
|
281bedb693
|
png
|
2013-05-10 05:24:03 -07:00 |
|
Jordan Bates
|
72eab323da
|
Release 4chan X v1.2.0.
|
2013-05-10 05:22:01 -07:00 |
|
Zixaphir
|
d8db801341
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
src/General/html/Settings/Advanced.html
|
2013-05-10 04:58:26 -07:00 |
|
Zixaphir
|
9ce09d216e
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/css/style.css
src/General/html/Features/QuickReply.html
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Posting/QuickReply.coffee
|
2013-05-10 02:41:08 -07:00 |
|
Jordan Bates
|
1dc8762747
|
Add image to changelog
|
2013-05-09 05:37:06 -07:00 |
|
Zixaphir
|
ee00d5a3aa
|
Merge branch 'v3' into Av2
Conflicts:
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Main.coffee
src/General/css/style.css
src/General/html/Features/QuickReply.html
src/Posting/QuickReply.coffee
|
2013-05-03 07:17:59 -07:00 |
|
Jordan Bates
|
9ebd79bb3e
|
Paste.installgentoo.net embedding
|
2013-05-01 12:58:05 -07:00 |
|
Jordan Bates
|
a9fa6dac56
|
External image embedding
|
2013-05-01 03:57:20 -07:00 |
|
Jordan Bates
|
f4affdacc2
|
Add gist embedding
|
2013-04-30 10:17:48 -07:00 |
|
Jordan Bates
|
bad0817cdf
|
Add the images
|
2013-04-30 08:14:50 -07:00 |
|
Zixaphir
|
77433f5da8
|
Merge branch 'v3' into Av2
Conflicts:
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx.crx
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/burichan.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/style.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/img/favicons/Original/unreadDead.gif
src/General/img/favicons/Original/unreadNSFW.gif
src/General/img/favicons/Original/unreadSFW.gif
src/General/img/favicons/dead.gif
src/General/img/favicons/empty.gif
src/General/img/favicons/ferongr/unreadDead.gif
src/General/img/favicons/ferongr/unreadNSFW.gif
src/General/img/favicons/ferongr/unreadSFW.gif
src/General/meta/metadata.js
src/Miscellaneous/AnnouncementHiding.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
src/features/misc/header.coffee
src/features/monitoring/favicon.coffee
|
2013-04-28 21:20:22 -07:00 |
|
Jordan Bates
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|