Zixaphir
|
f167a2f657
|
Merge branch 'json' into ajson
|
2014-01-11 16:14:29 -07:00 |
|
Zixaphir
|
2b1a49b02e
|
That didn't work as expected.
|
2014-01-11 16:14:16 -07:00 |
|
Zixaphir
|
bd08bd964d
|
Merge branch 'json' into ajson
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Features/Index-navlinks.html
src/General/html/Monitoring/ThreadWatcher.html
src/Images/Gallery.coffee
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QR.coffee
|
2014-01-11 15:55:46 -07:00 |
|
Zixaphir
|
dcb734afff
|
Small fix to backlinks code
|
2014-01-11 14:54:41 -07:00 |
|
Zixaphir
|
904316e4e0
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
|
2013-10-13 14:42:58 -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 |
|
Zixaphir
|
bc501dc022
|
Merge branch 'v3'
Conflicts:
.gitignore
CHANGELOG.md
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/html/Monitoring/ThreadWatcher.html
src/Images/ImageExpand.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
|
2013-08-15 23:02:54 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -07:00 |
|
Zixaphir
|
1a4871a01e
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/crx/script.js
src/General/Main.coffee
src/Posting/QuickReply.coffee
|
2013-08-08 14:57:35 -07:00 |
|
Zixaphir
|
ce6e317c98
|
Time to stop being silly.
|
2013-08-07 21:02:10 -07:00 |
|
Zixaphir
|
9fad0de110
|
Fix backlink positions
|
2013-06-02 14:23:23 -07:00 |
|
Jordan Bates
|
36b0ef5436
|
Backlinks
|
2013-05-10 05:58:27 -07:00 |
|
Zixaphir
|
7c330f39bc
|
Quote Hash Navigation
|
2013-05-06 14:49:55 -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 |
|