Brandon
|
5281d23218
|
Not you again...
|
2014-05-05 15:39:50 -07:00 |
|
Zixaphir
|
7301f43289
|
Merge branch 'v3'
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/General/css/yotsuba-b.css
src/Images/FappeTyme.coffee
|
2014-03-06 23:07:49 -07:00 |
|
Zixaphir
|
c7e5833dc9
|
Remove more references to the non-existent "catalog" view
|
2014-03-06 22:36:42 -07:00 |
|
Brandon
|
f7a3044409
|
Fix /f/ FappeTyme
|
2014-02-17 15:08:11 -08:00 |
|
Zixaphir
|
16b650f26c
|
Ads Please!
|
2013-12-16 18:49:25 -07:00 |
|
Zixaphir
|
57f7d899ec
|
Some last FappeTyme/WerkTyme tweaks
|
2013-12-16 18:36:09 -07:00 |
|
Zixaphir
|
68bc40cc45
|
Merge branch 'v3'
Conflicts:
src/Images/FappeTyme.coffee
|
2013-12-16 14:12:42 -07:00 |
|
Zixaphir
|
0033c5370f
|
Don't make last minute changes without testing. ;__;
|
2013-12-16 14:11:15 -07:00 |
|
Zixaphir
|
e156cc8e9c
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/crx/script.js
src/General/Config.coffee
src/Images/FappeTyme.coffee
src/Linkification/Linkify.coffee
|
2013-12-16 14:01:47 -07:00 |
|
Zixaphir
|
545a1f346f
|
"Fix" Fappe/Werk Tyme and actually fix Werk Tyme.
|
2013-12-16 13:36:19 -07:00 |
|
Zixaphir
|
33c8bdc32d
|
Release appchan x v2.6.1.
|
2013-11-27 17:04:13 -07:00 |
|
Zixaphir
|
904316e4e0
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
|
2013-10-13 14:42:58 -07:00 |
|
Zixaphir
|
91cedb3b89
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
html/General/Settings-section-Rice.html
img/changelog/3.9.0/0.png
package.json
src/Images/AutoGIF.coffee
src/Images/RevealSpoilers.coffee
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/IDColor.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteInline.coffee
src/Quotelinks/QuotePreview.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
|
2013-10-13 13:53:38 -07:00 |
|
Zixaphir
|
d4a3bc8a17
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-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/Settings.coffee
src/General/css/font-awesome.css
src/Images/FappeTyme.coffee
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
|
2013-08-24 13:57:27 -07:00 |
|
Zixaphir
|
dc0b4d3d41
|
Keybinds, Werk Tyme, more Mayhem-X-like IDColor
|
2013-08-24 11:24:49 -07:00 |
|
Zixaphir
|
e80797a0fb
|
Separate icons and "stats" in the shortcuts element
|
2013-08-21 11:26:48 -07:00 |
|
Zixaphir
|
1cf8b0fe9e
|
Werk Tyme
|
2013-08-20 01:11:32 -07:00 |
|
Zixaphir
|
7d626b9cb8
|
Get "slideout" UI working.
|
2013-08-20 00:20:29 -07:00 |
|
Zixaphir
|
1facbe7dc1
|
Get Flex actually working
|
2013-08-19 09:06:31 -07:00 |
|
Zixaphir
|
a730a0bc17
|
Start IconPositioner rewrite
|
2013-08-19 02:21:51 -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
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
5b84565c80
|
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
|
2013-05-08 06:24:19 -07:00 |
|
Zixaphir
|
4d365b825d
|
Fix FappeTyme always enabled.
|
2013-05-08 06:06:57 -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
|
628898fd74
|
Imaging -> Images
|
2013-04-26 14:23:00 -07:00 |
|