Zixaphir
|
0faacd737e
|
Revert "Lets pretend we're smarter than we really are!"
This reverts commit 393eb3ec2289293dd4d4caaef17db33bb695fa30.
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
|
2014-05-03 16:05:46 -07:00 |
|
Zixaphir
|
393eb3ec22
|
Lets pretend we're smarter than we really are!
|
2014-03-30 16:53:08 -07:00 |
|
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
|
9fb8ab50e1
|
MediaCrush embedding (the right way?)
|
2013-10-16 14:31:18 -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 |
|
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
|
8b992d42ed
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
src/General/Config.coffee
src/General/Main.coffee
src/General/lib/$.coffee
src/Miscellaneous/Time.coffee
|
2013-08-09 19:36:40 -07:00 |
|
Mayhem
|
6f6c1be3b1
|
Fix #1219.
|
2013-08-09 18:44:22 +02:00 |
|
Zixaphir
|
2158d35285
|
Add @detharonil's %Y and more future-proof %y
|
2013-05-05 17:39:30 -07:00 |
|
Jordan Bates
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|
Nicolas Stepien
|
a2e87f1200
|
Structure.
God damn War Thunder, download faster!
|
2013-04-26 17:40:51 +02:00 |
|