Zixaphir
77c64bc75a
Implement a theme and mascot switcher between SFW/NSFW boards
2014-01-12 17:41:30 -07:00
Zixaphir
966882c11d
Merge branch 'v3'
...
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/General/html/Settings/Advanced.html
2014-01-12 15:26:45 -07:00
Zixaphir
2bf8d37781
Add the 4chanJS favicon to settings
2014-01-12 15:24:00 -07:00
Zixaphir
69f3ef7aa9
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
2014-01-12 13:44:05 -07:00
Zixaphir
860ca555b7
This line was in error.
...
QR Personas are *always* enabled.
2014-01-12 13:43:10 -07:00
Zixaphir
bd08bd964d
Merge branch 'json' into ajson
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.meta.js
builds/appchan-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/Index.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Features/Index-navlinks.html
src/General/html/Monitoring/ThreadWatcher.html
src/Images/Gallery.coffee
src/Menu/Menu.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QR.coffee
2014-01-11 15:55:46 -07:00
Zixaphir
3a76018fe4
Add return buttons and the like to the Index.navLinks
...
We need to generate these now because the Index features always
will remove them.
2014-01-11 00:04:44 -07:00
Zixaphir
ab8607710b
Switch document class names when switching between views
2014-01-09 14:49:05 -07:00
Jordan
5682df5a2a
Tweak the clear search button a bit
2014-01-09 03:33:47 -07:00
Jordan
f217d94299
Menu button changes, close #223
2014-01-09 00:23:43 -07:00
Zixaphir
3adce28107
Attempt to do something about #456
...
This issue is all kinds of weird and the only people I can blame
seem to be Mozilla? I'm serious here, how else does a browser
*SOMETIMES* render a filter, but seem to always render it if it's
a Data URI instead of just an ID ...reference? I guess? I don't
know, piss off.
2013-12-25 20:18:18 -07:00
Zixaphir
af64ca5324
Merge branch 'v3'
2013-12-25 11:31:20 -07:00
Zixaphir
35b06b5bf8
Fixes for post building
2013-12-25 11:30:56 -07:00
Zixaphir
996080cab9
Merge branch 'v3'
...
Conflicts:
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Menu/Menu.coffee
src/Posting/QR.coffee
2013-12-25 11:23:41 -07:00
Zixaphir
b38f63e313
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
Gruntfile.coffee
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/lib/$.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
2013-12-25 10:54:21 -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
4f7a3b90f1
Some loose files
2013-11-22 17:26:38 -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
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
