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
|
1aa467b051
|
Remove all inline catalog-related code.
|
2014-01-29 16:25:52 +01:00 |
|
Zixaphir
|
2ac2286ad5
|
Merge branch 'mayhem' into v3
Conflicts:
CHANGELOG.md
src/General/lib/$.coffee
src/Images/Sauce.coffee
|
2014-01-28 01:11:06 -07:00 |
|
ParrotParrot
|
0aaa9af8cc
|
changed to lowercase
|
2014-01-25 20:35:12 +01:00 |
|
ParrotParrot
|
dbd4de88b1
|
%NAME is indeed better
|
2014-01-25 20:31:27 +01:00 |
|
ParrotParrot
|
7a2faf861e
|
Added %FNAME case to link.replace switch
|
2014-01-25 20:10:40 +01:00 |
|
Zixaphir
|
adaa09aaaa
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Fix some issues with previous merge.
Conflicts:
CHANGELOG.md
package.json
src/General/Header.coffee
src/Linkification/Linkify.coffee
|
2013-12-06 17:11:36 -07:00 |
|
Mayhem
|
3efffe8a6e
|
Fix 4chan X for markup change.
|
2013-12-07 00:03:55 +01: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 |
|
Mayhem
|
10e93091d7
|
{Post,Thread}::callbacks => {Post,Thread}.callbacks
|
2013-10-02 11:38:15 +02:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
582d067a10
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
Gruntfile.js
README.md
changelog-old
css/style.css
html/Monitoring/ThreadStats.html
html/Posting/QR.html
json/archives.json
package.json
src/Archive/Redirect.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Settings/Filter-guide.html
src/General/lib/$.coffee
src/General/lib/clone.class
src/General/lib/post.class
src/Images/ImageHover.coffee
src/Menu/Menu.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuotePreview.coffee
src/Quotelinks/Quotify.coffee
|
2013-07-21 08:39:40 -07:00 |
|
Mayhem
|
d93a4ebf4b
|
Shave two lines in Sauce.coffee.
|
2013-07-08 19:10:58 +02:00 |
|
Mayhem
|
2a99db7cdd
|
src/Miscellaneous/Sauce.coffee -> src/Images/Sauce.coffee
|
2013-07-02 18:23:12 +02:00 |
|