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 |
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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 |
|
seaweedchan
|
af21ad07bc
|
Merge Mayhem X
|
2013-06-14 03:14:54 -07:00 |
|
Jordan Bates
|
33c1d58d5f
|
Merge Mayhem X
|
2013-05-27 16:14:36 -07:00 |
|
Jordan Bates
|
902c08f807
|
Dont let deadlinks get stuck if problems loading
|
2013-05-20 16:28:02 -07:00 |
|
Jordan Bates
|
d35932ba0f
|
Mayhem X, update changelog
|
2013-05-20 15:13:06 -07:00 |
|
Jordan Bates
|
f4db0a60ff
|
Merge Mayhem X
|
2013-05-14 13:32:43 -07:00 |
|
Zixaphir
|
176913138c
|
Sometimes while loops are better than for loops.
|
2013-05-07 19:06:53 -07:00 |
|
seaweedchan
|
ee26f90b63
|
Use =>
|
2013-05-04 05:04:01 -07:00 |
|
Zixaphir
|
49585245ea
|
Small flavor change.
|
2013-05-03 07:14:14 -07:00 |
|
Zixaphir
|
d657c958c1
|
XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE === 6
|
2013-05-03 06:53:07 -07:00 |
|
Zixaphir
|
ef3c862543
|
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
LICENSE
builds/4chan-X.js
builds/4chan-X.user.js
builds/crx/script.js
|
2013-04-30 17:24:37 -07:00 |
|
Zixaphir
|
9ba7f2c3f2
|
Small indexOf optimization.
|
2013-04-30 17:22:08 -07:00 |
|
Jordan Bates
|
1771bcffde
|
Update nyafuu
|
2013-04-29 14:03:40 -07:00 |
|
Jordan Bates
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|