Zixaphir
|
0415de74c1
|
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
json/archives.json
package.json
src/Archive/Redirect.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/html/Build/post.html
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
|
2013-10-13 14:29:52 -07:00 |
|
Zixaphir
|
38010c0b26
|
A couple of small things
|
2013-10-13 13:57:36 -07:00 |
|
Zixaphir
|
d2ae42798a
|
Fix seaweedchan/4chan-x#172, fix seaweedchan/4chan-x#190
|
2013-09-24 15:03:35 -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 |
|
seaweedchan
|
a274214c07
|
Update post.html
|
2013-09-21 00:05:49 -07:00 |
|
Jordan Bates
|
85afe58c62
|
Close #172
|
2013-09-12 16:37:00 -07:00 |
|
Zixaphir
|
4db1fcd38e
|
Filters
|
2013-09-04 17:12:13 -07:00 |
|
Zixaphir
|
09936f3d6c
|
Adapt silhouette code to generate silhouette Mascots
|
2013-09-04 15:11:55 -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 |
|
Jordan Bates
|
231e151fbb
|
Release 4chan X v1.2.35.
|
2013-08-20 15:19:31 -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 |
|
seaweedchan
|
5d763b44f1
|
QR filename editing tweaks
|
2013-08-18 01:51:07 -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
|
6b98f8acb4
|
Make classes consistent with Mayhem X
|
2013-08-14 02:41:07 -07:00 |
|
Jordan Bates
|
368a5ee5c0
|
Fix #141
|
2013-08-13 15:20:20 -07:00 |
|
seaweedchan
|
b8062b0323
|
Merge Mayhem X
|
2013-08-13 00:39:05 -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
|
c71660bf60
|
Small oversight while merging
|
2013-08-12 18:55:06 -07:00 |
|
Zixaphir
|
03821c1ac9
|
Add our toggleable features and such
|
2013-08-12 18:41:38 -07:00 |
|
seaweedchan
|
875f0cd4f8
|
Merge Zixaphir X
|
2013-08-12 00:07:39 -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
|
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
|
9c494bbb0e
|
Fix mascot positionings
|
2013-06-20 21:06:33 -07:00 |
|
Zixaphir
|
2c7900442c
|
Oh lawd, is that a commit?
|
2013-06-20 17:09:20 -07:00 |
|
Zixaphir
|
191aec36ad
|
Rethink Emoji.
|
2013-06-06 07:19:46 -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
|
697078b084
|
I like this character better.
|
2013-06-01 17:12:20 -07:00 |
|
Zixaphir
|
7809ca0fe3
|
Basically redo theme importing.
|
2013-05-28 05:15:58 -07:00 |
|
Zixaphir
|
81bd621d0d
|
Merge branch 'v3'
Conflicts:
LICENSE
builds/4chan-X.js
builds/appchan-x.user.js
builds/crx/script.js
src/General/Main.coffee
src/General/css/style.css
src/General/html/Settings/Advanced.html
|
2013-05-23 15:51:51 -07:00 |
|
Jordan Bates
|
55447378f1
|
Some people find the custom nav guide confusing
|
2013-05-20 17:17:45 -07:00 |
|
Jordan Bates
|
b75d47e83b
|
CONTRIBUTING -> README
|
2013-05-15 11:26:06 -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
|
1bb474d28f
|
Add board selection to the archive selection.
Close seaweedchan/issues/80
|
2013-05-14 09:40:50 -07:00 |
|
Jordan Bates
|
f4e3629b4c
|
Remove Archive section, put back into Advanced
|
2013-05-13 07:17:19 -07:00 |
|
Zixaphir
|
249a739bfc
|
Add @MayhemYDG's archive redirection
|
2013-05-12 09:00:00 -07:00 |
|
Zixaphir
|
c4a008f402
|
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/General/css/style.css
|
2013-05-10 07:19:08 -07:00 |
|
Zixaphir
|
58b0d6585e
|
Sublime thread select.
|
2013-05-10 05:58:11 -07:00 |
|
Jordan Bates
|
629671092c
|
Update changelog, change note for custom nav
|
2013-05-10 05:08:13 -07:00 |
|
Zixaphir
|
d8db801341
|
Merge branch 'v3'
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx/script.js
src/General/html/Settings/Advanced.html
|
2013-05-10 04:58:26 -07:00 |
|
Zixaphir
|
5e105642ca
|
Use a textarea for custom navigation.
|
2013-05-10 04:13:13 -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 |
|
Jordan Bates
|
6eba459a7b
|
Use , instead of -url
|
2013-05-10 03:44:27 -07:00 |
|
Jordan Bates
|
f1c2ca4691
|
External links
|
2013-05-10 03:25:25 -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 |
|
Jordan Bates
|
f301551163
|
Spoiler styling, close #64
|
2013-05-09 01:48:28 -07:00 |
|