Zixaphir
2efa358131
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Navigate.coffee
src/Miscellaneous/CatalogLinks.coffee
src/Posting/QR.coffee
2014-05-27 12:39:01 -07:00
Zixaphir
37a3b05e39
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
package.json
src/Archive/archives.json
src/General/Get.coffee
src/General/Navigate.coffee
src/Images/Gallery.coffee
src/Linkification/Linkify.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
2014-05-11 16:04:14 -07:00
ccd0
57f780ebfb
apply Mayhem's quoting fix
2014-05-03 08:23:02 -07:00
Zixaphir
9d3ad61925
Merge branch 'v3'
...
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
2014-05-03 06:29:56 -07:00
Zixaphir
7375484693
Some misses
2014-05-03 06:27:49 -07:00
Zixaphir
c04c83f915
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Header.coffee
src/General/Main.coffee
src/General/css/font-awesome.css
src/General/html/Features/Index-navlinks.html
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadStats.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Theming/Banner.coffee
2014-05-03 06:20:04 -07:00
Zixaphir
a1601d8825
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
package.json
src/General/Build.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/lib/post.class
src/Monitoring/ThreadStats.coffee
2014-05-03 02:45:58 -07:00
Zixaphir
523d6bd9c4
Merge branch 'ccd0' into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
src/General/Build.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Navigate.coffee
src/General/css/style.css
src/General/html/Build/post.html
src/General/html/Features/Index-navlinks.html
src/General/lib/post.class
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
src/Miscellaneous/Banner.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.post.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/Quotify.coffee
2014-05-03 02:03:35 -07:00
Zixaphir
41ec3933cd
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Navigate.coffee
src/Miscellaneous/Keybinds.coffee
src/Posting/QR.coffee
2014-04-19 15:48:11 -07:00
ccd0
4ecd6f8cfe
res -> thread
2014-04-12 21:16:01 -07:00
ccd0
6cad2ae377
rewrite relative URL to tolerate slugs
2014-04-12 20:54:45 -07:00
Zixaphir
33943a06eb
Merge branch 'mayhem' into v3
...
Conflicts:
CHANGELOG.md
css/style.css
package.json
src/General/Build.coffee
src/General/Main.coffee
src/Images/ImageExpand.coffee
src/Images/ImageHover.coffee
src/Monitoring/ThreadUpdater.coffee
2014-04-12 18:13:21 -07:00
Zixaphir
ea47aefd93
Merge branch 'v3'
...
Conflicts:
.gitignore
CHANGELOG.md
CONTRIBUTING.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Header.coffee
src/General/Index.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Settings/Settings.html
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/ThreadWatcher.coffee
2014-04-11 00:29:52 -07:00
Zixaphir
b00390b980
Merge branch 'ccd0' into v3
...
Rebase ImageExpand implemention off ccd0's
Conflicts:
CHANGELOG.md
builds/4chan-X.user.js
builds/crx.crx
builds/crx/script.js
src/Images/ImageExpand.coffee
2014-04-08 14:46:15 -07:00
ccd0
c4962b015a
point to the issues page
2014-04-07 21:25:50 -07:00
ccd0
0a3bdbe2c9
fix spacing in settings
2014-04-07 21:22:07 -07:00
Zixaphir
6e03bb150e
Due to popular request, restore the catalog button.
2014-03-14 18:59:05 -07:00
Zixaphir
e459069ae6
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Config.coffee
src/General/css/style.css
src/Miscellaneous/AnnouncementHiding.coffee
src/Miscellaneous/InfiniScroll.coffee
src/Posting/QR.coffee
2014-03-13 18:12:44 -07:00
Zixaphir
60b3d447c5
Allow searching from URL bar without refreshing the page (add #s=search)
...
Reduce loops. Because we build threads in a loop, we can build replies
as we're building threads.
Go us.
2014-03-13 13:25:04 -07:00
Zixaphir
a24608999a
Update Custom Navigation HTML to reflect updated index mode options
2014-03-10 14:55:24 -07:00
Zixaphir
19cd95cf78
Get rid of more Catalog stuff
2014-03-07 17:12:43 -07:00
Zixaphir
fe8c67e03e
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
CONTRIBUTING.md
LICENSE
README.md
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Navigate.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/html/Features/Index-navlinks.html
src/Miscellaneous/CustomCSS.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteYou.coffee
2014-03-06 20:15:45 -07:00
Zixaphir
052f491191
Add missing files.
2014-03-03 00:05:42 -07:00
Zixaphir
19800bd0d9
Hide Index UI in thread view.
2014-03-01 15:07:26 -07:00
Zixaphir
db5cccc70f
Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)
...
Conflicts:
css/burichan.css
css/futaba.css
css/photon.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Settings-section-Main.html
html/General/Settings.html
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Settings.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadUpdater.coffee
2014-02-28 19:59:04 -07:00
Zixaphir
6ba92efcd4
Start working on fixing things after the last merge
2014-02-28 14:48:24 -07:00
Zixaphir
9d95bbea35
Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
css/burichan.css
css/futaba.css
css/photon.css
css/style.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Index-navlinks.html
html/General/Settings-section-Rice.html
html/General/Settings.html
html/Posting/QR.html
json/archives.json
package.json
src/Filtering/PostHiding.coffee
src/Filtering/Recursive.coffee
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/lib/$.coffee
src/General/lib/databoard.class
src/General/lib/post.class
src/General/lib/thread.class
src/Images/ImageExpand.coffee
src/Images/RevealSpoilers.coffee
src/Linkification/Linkify.coffee
src/Menu/Menu.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/IDColor.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/Unread.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.cooldown.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteCT.coffee
src/Quotelinks/QuoteOP.coffee
src/Quotelinks/QuoteStrikeThrough.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
2014-02-23 14:04:45 -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
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
