Zixaphir
|
f103fd0301
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
package.json
src/Archive/archives.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/Unread.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
|
2014-06-22 07:04:25 -07:00 |
|
Zixaphir
|
c7e5833dc9
|
Remove more references to the non-existent "catalog" view
|
2014-03-06 22:36:42 -07:00 |
|
Zixaphir
|
0033c5370f
|
Don't make last minute changes without testing. ;__;
|
2013-12-16 14:11:15 -07:00 |
|
Zixaphir
|
545a1f346f
|
"Fix" Fappe/Werk Tyme and actually fix Werk Tyme.
|
2013-12-16 13:36:19 -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
|
dc0b4d3d41
|
Keybinds, Werk Tyme, more Mayhem-X-like IDColor
|
2013-08-24 11:24:49 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Jordan Bates
|
628898fd74
|
Imaging -> Images
|
2013-04-26 14:23:00 -07:00 |
|