Zixaphir
a24608999a
Update Custom Navigation HTML to reflect updated index mode options
2014-03-10 14:55:24 -07:00
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
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
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
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
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
38010c0b26
A couple of small things
2013-10-13 13:57:36 -07:00
Zixaphir
09936f3d6c
Adapt silhouette code to generate silhouette Mascots
2013-09-04 15:11:55 -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
875f0cd4f8
Merge Zixaphir X
2013-08-12 00:07:39 -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
191aec36ad
Rethink Emoji.
2013-06-06 07:19:46 -07:00
Zixaphir
af48ff03ea
Ensure mascot element is passed around correctly
2013-06-03 13:36:40 -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
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
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
31c3af58aa
Some rethinking of how to handle theme and mascots sections.
2013-05-09 00:46:12 -07:00
Zixaphir
a87ec3a060
More or less improve the mascot section code.
2013-05-08 05:35:52 -07:00
Zixaphir
376a7a1218
Merge branch 'v3' into Av2
...
Conflicts:
builds/4chan-X.js
builds/appchan-x.user.js
builds/crx/script.js
2013-05-05 19:21:56 -07:00
Zixaphir
2158d35285
Add @detharonil's %Y and more future-proof %y
2013-05-05 17:39:30 -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
81d65cc3ca
QR doesn't need its own settings section
2013-05-01 02:46:29 -07:00
Zixaphir
77433f5da8
Merge branch 'v3' into Av2
...
Conflicts:
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx.crx
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.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/img/favicons/Original/unreadDead.gif
src/General/img/favicons/Original/unreadNSFW.gif
src/General/img/favicons/Original/unreadSFW.gif
src/General/img/favicons/dead.gif
src/General/img/favicons/empty.gif
src/General/img/favicons/ferongr/unreadDead.gif
src/General/img/favicons/ferongr/unreadNSFW.gif
src/General/img/favicons/ferongr/unreadSFW.gif
src/General/meta/metadata.js
src/Miscellaneous/AnnouncementHiding.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
src/features/misc/header.coffee
src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07:00
Jordan Bates
b7087b249e
These mistakes happen too often for me to not put them in .gitignore
2013-04-28 10:45:31 -07:00
Jordan Bates
4f779ae64d
Merge Mayhem X
2013-04-28 10:37:12 -07:00
