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 |
|
Mayhem
|
e062f1626f
|
Remove Cooldown Prediction.
|
2014-02-05 09:32:01 +01:00 |
|
Mayhem
|
c5490f6aec
|
Fix cooldowns never expiring.
|
2014-02-01 15:41:36 +01:00 |
|
Mayhem
|
2082e46cc5
|
typo
tee hee #1342
|
2014-02-01 00:01:17 +01:00 |
|
Mayhem
|
c1e76c8805
|
Update deps.
|
2014-01-29 23:45:55 +01:00 |
|
Zixaphir
|
b38f63e313
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
Gruntfile.coffee
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/lib/$.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
|
2013-12-25 10:54:21 -07:00 |
|
Mayhem
|
a646d532b2
|
Split QR.coffee into multiple files.
|
2013-12-19 04:34:37 +01:00 |
|