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
Zixaphir
a3c1afa5cd
Merge -- probably bugged until I sort out everything
...
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
changelog-old
css/style.css
html/General/Settings.html
html/Monitoring/ThreadUpdater.html
html/Monitoring/ThreadWatcher.html
html/Posting/QR.html
package.json
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/post.class
src/General/meta/manifest.json
src/Images/ImageExpand.coffee
src/Meta/banner.js
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/Keybinds.coffee
src/Miscellaneous/Nav.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -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
Jordan Bates
3470929e05
Merge some mayhem changes
2013-09-19 07:27:53 -07:00
Zixaphir
ccc0335b79
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
css/style.css
html/Monitoring/ThreadWatcher.html
json/archives.json
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/img/favicons/empty.gif
src/Linkification/Linkify.coffee
src/Miscellaneous/ExpandComment.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
seaweedchan
875f0cd4f8
Merge Zixaphir X
2013-08-12 00:07:39 -07:00
Zixaphir
8b01a46f30
I have a thing about these kinda things.
2013-08-07 01:54:29 -07:00
Zixaphir
0325539d43
Let's dig.
2013-08-07 00:21:26 -07:00
Zixaphir
cb30242ae8
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
src/General/Header.coffee
2013-08-05 14:37:23 -07:00
Zixaphir
f41a40c1ad
Forgot to add links to the post datatype
2013-08-04 19:47:07 -07:00
Zixaphir
dd4d979276
Still being different for the sake of being difficult
2013-07-24 22:01:48 -07:00
Zixaphir
0ac6747810
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
json/archives.json
src/General/Main.coffee
2013-07-24 21:55:26 -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
Zixaphir
176913138c
Sometimes while loops are better than for loops.
2013-05-07 19:06:53 -07:00
Jordan Bates
09baa3feea
Merge Mayhem's structure
2013-04-26 14:04:12 -07:00
