ccd0
7147ad0a01
Merge from Appchan X: src/Miscellaneous
...
excluded: CatalogLinks.coffee
deferred: Flash.coffee
2015-01-31 01:01:56 -08:00
ccd0
94928b7c83
Merge from Appchan X: Whitespace and other changes not affecting compiled script.
2015-01-30 01:22:40 -08:00
ccd0
cc0cc82c4c
fix comment expansion
2014-04-20 01:21:37 -07:00
ccd0
823eace903
begin work on restoring comment expansion
2014-04-19 21:44:13 -07:00
ccd0
c5b06f6988
Merge branch 'page1' into newnames
2014-04-13 01:38:24 -07:00
ccd0
814b64b31c
update URLs to 4cdn.org
2014-04-12 22:37:27 -07:00
ccd0
4ecd6f8cfe
res -> thread
2014-04-12 21:16:01 -07:00
Zixaphir
91233b8d61
remove [].contains. It was a bad idea.
...
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
2013-12-24 14:41:21 -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
Jordan Bates
3470929e05
Merge some mayhem changes
2013-09-19 07:27:53 -07:00
Mayhem
5ae957b0e2
Remove capcode replies-related code as it's not relevant anymore.
2013-09-19 11:53:11 +02:00
noface
202d7617e3
Add Linkification.
2013-08-18 20:53:08 +02:00
seaweedchan
b9b4efae5e
Merge in new thread watcher and change a few things
2013-08-13 00:03:29 -07:00
Zixaphir
e0895c594a
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
css/style.css
src/Archive/Redirect.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/General/lib/databoard.class
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
2013-08-12 18:26:39 -07:00
seaweedchan
875f0cd4f8
Merge Zixaphir X
2013-08-12 00:07:39 -07:00
Mayhem
35cfa595bf
Shave a line.
2013-08-11 23:41:49 +02:00
Mayhem
fbe724a174
Fix #1162 .
2013-08-10 23:50:04 +02:00
Jordan Bates
e95d49f70e
Un-Mayhem
2013-04-29 23:42:59 -07:00
Nicolas Stepien
b18acfcef2
Fix #1076 .
2013-04-30 03:35:55 +02: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
