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
3ad1c6040c
Redo FontAwesome stuff, I guess.
2013-11-23 13:23:36 -07:00
Zixaphir
34140232fb
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/font-awesome.css
src/General/lib/notice.class
src/General/meta/metadata.js
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
worksforme.png
2013-11-23 12:56:42 -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
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
Zixaphir
7812001d96
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
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/css/style.css
src/Posting/QuickReply.coffee
2013-09-24 14:46:24 -07:00
Jordan Bates
3470929e05
Merge some mayhem changes
2013-09-19 07:27:53 -07:00
Zixaphir
d4a3bc8a17
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-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/Settings.coffee
src/General/css/font-awesome.css
src/Images/FappeTyme.coffee
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
c4fdaea615
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
css/style.css
src/General/Config.coffee
src/General/Main.coffee
src/General/lib/post.class
src/Posting/QuickReply.coffee
2013-08-24 13:08:23 -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
Zixaphir
3c0c478ded
Some touchups
2013-08-20 00:56:18 -07:00
Zixaphir
72e3fc2585
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Features/QuickReply.html
src/General/img/favicons/xat-/unreadDead.png
src/General/img/favicons/xat-/unreadDeadY.png
src/General/img/favicons/xat-/unreadNSFW.png
src/General/img/favicons/xat-/unreadNSFWY.png
src/General/img/favicons/xat-/unreadSFW.png
src/General/img/favicons/xat-/unreadSFWY.png
src/General/meta/banner.js
src/General/meta/metadata.js
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
Zixaphir
ec32e54ef5
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
css/style.css
src/General/Config.coffee
src/General/meta/manifest.json
src/Posting/QuickReply.coffee
2013-08-17 21:00:31 -07:00
Zixaphir
d15f8ee728
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
css/style.css
html/Posting/QR.html
img/changelog/3.2.0/0.png
package.json
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Notice.coffee
src/General/Notification.coffee
src/General/Settings.coffee
src/General/img/icon.gif
src/General/lib/notification.class
src/Monitoring/Favicon.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07: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
2fcbe0bf30
Merge Zixaphir X
2013-08-14 03:12:10 -07:00
Zixaphir
1f011dfd02
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
html/General/Header.html
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/UI.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
2013-08-14 03:02:03 -07:00
seaweedchan
b9b4efae5e
Merge in new thread watcher and change a few things
2013-08-13 00:03:29 -07:00
Zixaphir
6c2c9b281a
Merge branch 'v3'
...
Conflicts:
builds/crx/script.js
src/General/Config.coffee
src/General/Settings.coffee
src/Miscellaneous/ExpandComment.coffee
src/Monitoring/ThreadWatcher.coffee
2013-08-12 19:22:37 -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
Zixaphir
00675c32bc
Merge branch 'v3'
...
Conflicts:
builds/crx/script.js
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/Quotelinks/QuoteYou.coffee
2013-08-09 19:45:24 -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
Zixaphir
f1d1aca203
Fix some things.
2013-08-08 15:49:00 -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
80884e2bde
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
src/General/Main.coffee
src/General/lib/$.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-08-07 13:53:35 -07:00
Zixaphir
ff46f521b2
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/crx/script.js
2013-08-07 02:02:58 -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
ae9b197d3f
Merge branch 'v3'
...
Conflicts:
builds/crx/script.js
src/General/Settings.coffee
2013-08-05 14:38:52 -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
217f1cd42c
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Main.coffee
src/Linkification/Linkify.coffee
2013-08-04 20:10:29 -07:00
Zixaphir
f41a40c1ad
Forgot to add links to the post datatype
2013-08-04 19:47:07 -07:00
Zixaphir
2fa674c782
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
Gruntfile.coffee
json/archives.json
src/Archive/Redirect.coffee
src/General/lib/$.coffee
src/Monitoring/Unread.coffee
2013-08-04 19:44:42 -07:00
Zixaphir
541454d45a
Linkifier rewrite.
2013-08-04 01:39:34 -07:00
Zixaphir
3922530efb
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/crx/script.js
2013-08-01 10:27:11 -07:00
Zixaphir
093fd54413
Fix $.open
...
Should fix the issue with opening things in new tabs. Yes, I'm dumb
2013-08-01 10:26:06 -07:00
Zixaphir
a6d05a6115
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/lib/post.class
src/Posting/QuickReply.coffee
2013-07-24 22:17:35 -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
16b35dffce
Merge branch 'v3'
...
Conflicts:
.gitignore
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Globals.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/UI.coffee
src/General/css/style.css
src/General/meta/manifest.json
src/Posting/QuickReply.coffee
2013-07-21 09:01:27 -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
27c6f07913
Let's be better than we are
...
Should fix some padding issues, optimize theme editting, and a
bit of other stuff that's hard to remember.
2013-06-21 00:11:10 -07:00
Zixaphir
ebfaaaacc4
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Main.coffee
src/General/css/style.css
src/Posting/QuickReply.coffee
2013-06-20 17:21:01 -07:00
seaweedchan
af21ad07bc
Merge Mayhem X
2013-06-14 03:14:54 -07:00
Zixaphir
697078b084
I like this character better.
2013-06-01 17:12:20 -07:00
Zixaphir
a86b1da74f
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
2013-05-28 05:57:21 -07:00
Jordan Bates
33c1d58d5f
Merge Mayhem X
2013-05-27 16:14:36 -07:00
