Zixaphir
d11b435134
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/icon16.png
builds/crx/icon48.png
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/html/Features/QuickReply.html
src/General/img/icon16.png
src/General/img/icon48.png
src/Miscellaneous/Emoji.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
2014-02-16 02:17:36 -07:00
Zixaphir
6dd0cac797
Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/script.js
src/Archive/Redirect.coffee
src/General/Header.coffee
src/Monitoring/Favicon.coffee
2014-02-16 01:00:41 -07:00
Kabir Sala
cff413769e
cleanup
2014-02-12 23:56:30 +01:00
Kabir Sala
c74d72d75e
More font awesome
2014-02-11 23:38:36 +01:00
Kabir Sala
d8a168a549
More work on post from url
2014-02-11 23:37:52 +01:00
Kabir Sala
f0bd6b1b04
Start working on remote upload (Chrome-only so far)
2014-02-11 18:32:23 +01:00
Kabir Sala
d22dceea5a
Add Metro favicon (why not?)
2014-02-10 18:00:34 +01:00
Zixaphir
1b633a5517
Fix navbar spacing in settings
2014-01-28 01:32:59 -07:00
Zixaphir
9199f12ce0
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/Images/Sauce.coffee
2014-01-28 01:14:01 -07:00
Zixaphir
2ac2286ad5
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
src/General/lib/$.coffee
src/Images/Sauce.coffee
2014-01-28 01:11:06 -07:00
Zixaphir
1f49ef2212
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Settings/Settings.html
src/Miscellaneous/AnnouncementHiding.coffee
2014-01-26 11:40:50 -07:00
Zixaphir
f133da454d
Fix settings dialog, customize reset button
2014-01-22 12:24:30 -07:00
Zixaphir
b6749b91a5
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
css/style.css
html/General/Settings-section-Main.html
json/archives.json
package.json
src/Archive/Redirect.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/General/lib/thread.class
src/Linkification/Linkify.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadStats.coffee
2014-01-22 12:10:34 -07:00
Zixaphir
94dd0e555f
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Menu/Menu.coffee
2014-01-13 13:25:43 -07:00
Zixaphir
3f849a95d8
Use brackets-wrap
...
This also should make things easier for people who use userstyles
who would want to hide brackets or otherwise change their content
without resorting to weird hacks, like changing the font size of
the parent element to 0 and making text invisible, and then
reverting it in child elements.
2014-01-12 23:49:25 -07:00
Zixaphir
99a6565ca9
Merge branch 'v3'
...
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/Monitoring/Favicon.coffee
2014-01-12 19:46:28 -07:00
Zixaphir
251eaf802f
Fix Favicon on Catalog
2014-01-12 19:44:47 -07:00
Zixaphir
f8035ffded
Dammit
2014-01-12 19:25:16 -07:00
Zixaphir
790ce952a7
Wait, wait, no. Escape that shit.
2014-01-12 17:46:05 -07:00
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
