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
|
44a2b378ca
|
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
package.json
src/Posting/QuickReply.coffee
|
2013-07-24 21:49:24 -07:00 |
|
Matt Wilmink
|
aba70b9f15
|
Fix #118
|
2013-07-23 22:46:20 -04:00 |
|
Jordan Bates
|
07cb9074e0
|
Better error message
Close #96
|
2013-07-22 08:52:18 -07:00 |
|
Jordan Bates
|
c9ec6b5497
|
Fix #113
|
2013-07-22 08:38:49 -07:00 |
|
Jordan Bates
|
3e35ced05e
|
Fix captcha caching across threads
|
2013-07-22 07:52:02 -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
|
283a33c443
|
A lot of backpedaling here.
|
2013-06-20 19:20:32 -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 |
|
Zixaphir
|
2c7900442c
|
Oh lawd, is that a commit?
|
2013-06-20 17:09:20 -07:00 |
|
seaweedchan
|
af21ad07bc
|
Merge Mayhem X
|
2013-06-14 03:14:54 -07:00 |
|
Zixaphir
|
97b3069af1
|
close #349
|
2013-06-04 10:48:13 -07:00 |
|
Zixaphir
|
af48ff03ea
|
Ensure mascot element is passed around correctly
|
2013-06-03 13:36:40 -07:00 |
|
Zixaphir
|
dcac62d45e
|
Rethink mascots (again)
|
2013-06-03 10:03:47 -07:00 |
|
Zixaphir
|
697078b084
|
I like this character better.
|
2013-06-01 17:12:20 -07:00 |
|
Zixaphir
|
271aeb9bf7
|
Yeah, this will probably break a lot...
|
2013-05-31 16:55:30 -07:00 |
|
Zixaphir
|
918d364fc1
|
Close #285
|
2013-05-28 16:43:46 -07:00 |
|
Zixaphir
|
ca4be499a3
|
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
|
2013-05-27 14:22:31 -07:00 |
|
Jordan Bates
|
4481b56851
|
Mayhem X
|
2013-05-27 06:13:40 -07:00 |
|
seaweedchan
|
d9cad02d72
|
Fix #86
|
2013-05-24 23:40:50 -07:00 |
|
Zixaphir
|
7ef6aa71fd
|
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/Config.coffee
src/General/Main.coffee
src/General/css/style.css
src/Posting/QuickReply.coffee
|
2013-05-20 17:06:30 -07:00 |
|
Jordan Bates
|
9462910961
|
Dont really need a title
|
2013-05-20 01:07:45 -07:00 |
|
Jordan Bates
|
f4059e723d
|
QR link fixes
|
2013-05-20 01:05:49 -07:00 |
|
seaweedchan
|
ab8977fb6e
|
Restrict click event to link
|
2013-05-18 03:43:43 -07:00 |
|
Jordan Bates
|
2f9304840d
|
Higher default cooldown on /q/, thanks moot
|
2013-05-17 04:41:18 -07:00 |
|
Zixaphir
|
70d1d758ec
|
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-05-15 09:00:09 -07:00 |
|
Jordan Bates
|
f91702b984
|
Option affects lack of captcha warning as well
|
2013-05-15 06:11:01 -07:00 |
|
Jordan Bates
|
51dee38f95
|
Redundancy
|
2013-05-15 03:41:57 -07:00 |
|
Jordan Bates
|
61813b28d7
|
Add Mistyped Captcha Errors option
|
2013-05-15 03:38:31 -07:00 |
|
Jordan Bates
|
fc732df167
|
Mayhem X
|
2013-05-14 19:29:56 -07:00 |
|
Jordan Bates
|
2550ab73c1
|
QR shortcut and link changes
Don't close QR if Persistent, and
Don't close QR on Reply to Thread click
|
2013-05-14 19:16:55 -07:00 |
|
Zixaphir
|
1debf61f2e
|
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/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/burichan.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/style.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Settings/Advanced.html
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
|
2013-05-14 11:40:38 -07:00 |
|
Zixaphir
|
6bc0e8de92
|
close seaweedchan/issues/78
|
2013-05-14 08:57:45 -07:00 |
|
Jordan Bates
|
23e508d7c0
|
Close dump list when everythings posted, @zixaphir
|
2013-05-10 17:00:43 -07:00 |
|
Zixaphir
|
b2e1048857
|
Automatically close the dump list after posting all posts.
|
2013-05-10 16:11:05 -07:00 |
|
Zixaphir
|
58b0d6585e
|
Sublime thread select.
|
2013-05-10 05:58:11 -07:00 |
|
Zixaphir
|
c141a1973b
|
More rice than you can shake a stick at.
You're gonna need a new rice cooker.
|
2013-05-10 03:58:24 -07:00 |
|
Zixaphir
|
9ce09d216e
|
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
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/css/style.css
src/General/html/Features/QuickReply.html
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Posting/QuickReply.coffee
|
2013-05-10 02:41:08 -07:00 |
|
Zixaphir
|
94124f953b
|
Add options for header and page QR shortcuts. #280
|
2013-05-09 02:02:59 -07:00 |
|
Jordan Bates
|
f301551163
|
Spoiler styling, close #64
|
2013-05-09 01:48:28 -07:00 |
|
Jordan Bates
|
742cad08ce
|
Move dump button
|
2013-05-09 00:36:10 -07:00 |
|
Jordan Bates
|
39b4a3b1d2
|
Move filerm inside container
|
2013-05-07 23:40:19 -07:00 |
|
Zixaphir
|
93b94ec9d0
|
Merge branch 'v3' into Av2
Conflicts:
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
builds/version
package.json
src/General/Main.coffee
src/General/css/style.css
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteInline.coffee
|
2013-05-06 16:54:39 -07:00 |
|
Zixaphir
|
59c6b551a1
|
Fix the QR's thread select.
|
2013-05-06 15:43:02 -07:00 |
|
Zixaphir
|
9422747edc
|
__indexOf
|
2013-05-05 20:22:08 -07:00 |
|
Zixaphir
|
8b3dbc82fd
|
Getting somewhere...
|
2013-05-03 10:43:14 -07:00 |
|
Zixaphir
|
ee00d5a3aa
|
Merge branch 'v3' into Av2
Conflicts:
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Main.coffee
src/General/css/style.css
src/General/html/Features/QuickReply.html
src/Posting/QuickReply.coffee
|
2013-05-03 07:17:59 -07:00 |
|
Jordan Bates
|
a1e52052f3
|
Posting Success Notifications fix
|
2013-05-01 16:44:54 -07:00 |
|
Jordan Bates
|
b0a9ce5667
|
Merge Mayhem X
|
2013-05-01 14:21:07 -07:00 |
|