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
|
6b98f8acb4
|
Make classes consistent with Mayhem X
|
2013-08-14 02:41:07 -07:00 |
|
Jordan Bates
|
f345151583
|
Merge branch 'v3' of https://github.com/zixaphir/appchan-x
|
2013-08-13 15:37:18 -07:00 |
|
Zixaphir
|
175880a4bd
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/crx/script.js
|
2013-08-13 15:13:13 -07:00 |
|
Zixaphir
|
0cc7b8ee29
|
Couple small changes
|
2013-08-13 15:12:27 -07:00 |
|
Mayhem
|
3581a235e7
|
Fix post menus in stubs.
Also removed some old arguments, fixed some semantics, added Get.threadFromNode, and used it.
|
2013-08-13 16:29:54 +02: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
|
58d06b4db6
|
Remove some unwanted changes
|
2013-08-12 01:21:22 -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 |
|
Zixaphir
|
73ea806592
|
Merge branch 'v3'
Conflicts:
Gruntfile.coffee
LICENSE
builds/crx/script.js
|
2013-08-10 14:41:26 -07:00 |
|
Zixaphir
|
6602bb885d
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
package.json
src/Quotelinks/QuoteYou.coffee
|
2013-08-10 14:37:45 -07:00 |
|
Mayhem
|
a12d50981b
|
Shorter dice format.
|
2013-08-10 15:05:44 +02: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 |
|
Mayhem
|
6f6c1be3b1
|
Fix #1219.
|
2013-08-09 18:44:22 +02:00 |
|
Zixaphir
|
dbc8e21297
|
Merge branch 'v3'
Conflicts:
builds/crx/script.js
|
2013-08-08 23:56:30 -07:00 |
|
Zixaphir
|
6ba8d9ae8c
|
Keybind to scroll to posts quoting you.
|
2013-08-08 23:53:48 -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
|
bd1dc8cb53
|
Fix #298
|
2013-08-08 14:35:26 -07:00 |
|
Zixaphir
|
254fa9959b
|
And a couple more fixes #136
|
2013-08-08 14:27:38 -07:00 |
|
Zixaphir
|
ee4ece2574
|
Fix a few features identifying themselves incorrectly
A few refactors to ColorUserIDs
|
2013-08-08 14:18:44 -07:00 |
|
Mayhem
|
2cbf3d909d
|
Tweak dice code further. #1218
Also use `data` instead of `textContent` as it performs faster.
|
2013-08-08 17:28:35 +02:00 |
|
Mayhem
|
8c95fe1995
|
Tweak Dice code. #1218
|
2013-08-08 11:25:03 +02:00 |
|
carboncopy
|
bcbae6c84f
|
display rolled dice while on /tg/
|
2013-08-07 15:53:15 -05:00 |
|
Zixaphir
|
4410a8f118
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/crx/script.js
|
2013-08-06 16:03:07 -07:00 |
|
Zixaphir
|
9b5cb52619
|
Personal choices
|
2013-08-06 12:14:23 -07:00 |
|
Zixaphir
|
fe20262e5e
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
src/Miscellaneous/ExpandThread.coffee
|
2013-08-06 12:01:16 -07:00 |
|
Mayhem
|
be7a4052fd
|
Close #1106
|
2013-08-06 16:28:54 +02:00 |
|
Mayhem
|
63cd0aa164
|
ExpandThread tweaking.
Also fix code trying to $.off `ExpandThread.cb.toggle`.
|
2013-08-06 15:27:16 +02: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
|
d01c811fe2
|
Another indexOf I missed.
|
2013-07-24 22:06:08 -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 |
|
Mayhem
|
2a99db7cdd
|
src/Miscellaneous/Sauce.coffee -> src/Images/Sauce.coffee
|
2013-07-02 18:23:12 +02:00 |
|
Mayhem
|
573bd6f294
|
Fix #1146.
|
2013-06-29 18:04:23 +02: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
|
972a8b5261
|
Indicate Spoilers -> Reveal Spoilers, changelog
|
2013-06-14 03:37:41 -07:00 |
|
seaweedchan
|
f6d8ee29ae
|
Close #102
|
2013-06-14 03:30:18 -07:00 |
|
seaweedchan
|
af21ad07bc
|
Merge Mayhem X
|
2013-06-14 03:14:54 -07:00 |
|
Daniel
|
63daa91521
|
Fix ID coloring style
Add 'border-radius' and 'padding' to IDs with black colored text.
|
2013-06-13 01:48:54 +03:00 |
|
Mayhem
|
dc2ed6f6f3
|
Fix captcha support in the report window.
Also shave a line.
|
2013-06-11 17:34:55 +02:00 |
|
Mayhem
|
336e69c4fe
|
No need to use to preserve whitespaces anymore.
|
2013-06-08 20:20:59 +02:00 |
|
Mayhem
|
8251b46778
|
typo
|
2013-06-01 20:55:33 +02:00 |
|
Mayhem
|
982ec6ecc6
|
Remove PSA workaround.
Also this DOMAttrModified actually works.
|
2013-06-01 17:03:49 +02:00 |
|
Mayhem
|
1752e15da9
|
Close #1128.
|
2013-05-31 21:44:06 +02:00 |
|
Zixaphir
|
d038ac9e80
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/4chan-X.js
builds/appchan-x.user.js
builds/crx/script.js
|
2013-05-28 06:46:31 -07:00 |
|