Zixaphir
|
9d95bbea35
|
Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)
Conflicts:
CHANGELOG.md
Gruntfile.coffee
css/burichan.css
css/futaba.css
css/photon.css
css/style.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Index-navlinks.html
html/General/Settings-section-Rice.html
html/General/Settings.html
html/Posting/QR.html
json/archives.json
package.json
src/Filtering/PostHiding.coffee
src/Filtering/Recursive.coffee
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/lib/$.coffee
src/General/lib/databoard.class
src/General/lib/post.class
src/General/lib/thread.class
src/Images/ImageExpand.coffee
src/Images/RevealSpoilers.coffee
src/Linkification/Linkify.coffee
src/Menu/Menu.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/IDColor.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.cooldown.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteCT.coffee
src/Quotelinks/QuoteOP.coffee
src/Quotelinks/QuoteStrikeThrough.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
|
2014-02-23 14:04:45 -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
|
847078db53
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
json/archives.json
package.json
src/Filtering/Anonymize.coffee
src/General/Config.coffee
src/General/lib/post.class
src/Linkification/Linkify.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
|
2013-09-20 05:45:04 -07:00 |
|
Jordan Bates
|
3470929e05
|
Merge some mayhem changes
|
2013-09-19 07:27:53 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Jordan Bates
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|