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
3d0dd62556
Try to get some better errors out of QR.req.onerror
2014-01-19 15:18:57 -07:00
Zixaphir
a1a427dbda
Fix space in quote hash navigation
2014-01-19 04:31:50 -07:00
Zixaphir
8e1469ed55
Fix some hover issues caused by me being a n00b when I wrote them
2014-01-17 12:49:56 -07:00
Zixaphir
8781f52a36
Remove the Force Reply Break option on Chrome
...
Disabling it was broken, so now it's forced. Sorry.
2014-01-13 13:36:51 -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
4da7bd827d
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
...
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
2014-01-13 13:11:19 -07:00
Zixaphir
d41448a403
Work around a small issue
...
causing the space after a quotelink to disappear after inlining a
post and uninlining it.
Seriously.
2014-01-13 00:23:40 -07:00
Zixaphir
561ca0be64
Typo
2014-01-13 00:12:34 -07:00
Zixaphir
971b7d971e
Better QuoteInline process
2014-01-13 00:09: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
Jordan
d914619e69
Revert a bit of menu code for #240
2014-01-12 19:32:50 -07:00
Zixaphir
ca153df551
Fix catalog, add some CSS for index features
2014-01-12 18:53:34 -07:00
Zixaphir
77c64bc75a
Implement a theme and mascot switcher between SFW/NSFW boards
2014-01-12 17:41:30 -07:00
Zixaphir
aa48ee519c
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
2014-01-12 14:56:32 -07:00
Zixaphir
1b368e4edc
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
...
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
src/Archive/Redirect.coffee
src/General/Index.coffee
2014-01-12 14:52:47 -07:00
Zixaphir
41e6feacbb
Add a pseudo element class for font awesome, use it for submenus
2014-01-12 14:13:56 -07:00
Zixaphir
0f1ab5c5a5
Finally make the Captcha Filter into an option
...
I'm fairly certain I've "fixed" the invisible captcha issue, but
for whatever reason, someone might just not want a filter.
2014-01-12 13:56:11 -07:00
Jordan
a1e3793cb5
Make a few changes specific to the fixed header
...
Close #239
2014-01-11 22:18:03 -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
a44e75862f
Merge branch 'v3' into json
...
Conflicts:
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
2014-01-10 17:18:23 -07:00
Jordan
bc202ff700
Chrome fixes
...
Close #230
2014-01-10 08:58:39 -07:00
Jordan
64b13ef184
Board title and announcement tweaks
...
Close #232 , close #233
2014-01-10 08:34:56 -07:00
Jordan
52a287f11f
Announcement hiding button in font awesome
...
Close #231
2014-01-10 07:44:54 -07:00
Zixaphir
890277f296
Update QR depending on state.
2014-01-09 23:20:38 -07:00
Jordan
28d9e88856
Leave this :not in here
2014-01-09 20:24:02 -07:00
Jordan
9a66c0286c
Restyle QR link
...
Close #224
2014-01-09 20:22:08 -07:00
Jordan
6e5e4cfb45
Rgba instead of opacity
...
Close #228
2014-01-09 18:18:38 -07:00
Jordan
37accb230d
Touch up menus and .current border
...
Close #227 , close #229
2014-01-09 18:12:30 -07:00
Jordan
436e138895
Merge Zixaphir X
2014-01-09 17:42:57 -07:00
Zixaphir
ab8607710b
Switch document class names when switching between views
2014-01-09 14:49:05 -07:00
Zixaphir
9478dabdad
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
package.json
src/General/css/font-awesome.css
2014-01-09 10:12:28 -07:00
Jordan
5682df5a2a
Tweak the clear search button a bit
2014-01-09 03:33:47 -07:00
Jordan
526783d273
Font-awesome hide buttons, close #226
2014-01-09 03:05:46 -07:00
Jordan
feca837cbc
Restyle header a bit, close #220
2014-01-09 01:55:52 -07:00
Jordan
f217d94299
Menu button changes, close #223
2014-01-09 00:23:43 -07:00
Jordan
8575c0ce87
Redundancy
2014-01-08 23:34:52 -07:00
Jordan
26ee14e688
Update font-awesome
2014-01-08 23:33:52 -07:00
Jordan
8419b7c88b
Merge Zixaphir X, close #221
2014-01-08 20:55:13 -07:00
Zixaphir
63b09cb803
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.user.js
builds/crx/script.js
package.json
src/Archive/Redirect.coffee
src/General/Build.coffee
src/General/css/font-awesome.css
src/General/lib/databoard.class
src/Miscellaneous/ExpandThread.coffee
src/Monitoring/ThreadUpdater.coffee
2014-01-07 20:28:47 -07:00
Jordan
7c9d3b7fe1
Remove annoying moot text that gets added when adblocking ads
2014-01-07 02:48:37 -07:00
Jordan
4d3195bbb9
Update font-awesome
2014-01-07 02:00:47 -07:00
Zixaphir
749b950f5f
Split out Color from Style.
...
Also refactor a small section
2014-01-02 17:34:01 -07:00
Zixaphir
366ffd6558
My eventual goal is to move all of this into my JSColor
...
implementation.
2014-01-02 03:45:58 -07:00
Zixaphir
797a3718ae
Fix #511
2013-12-27 15:44:00 -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
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
d7ceb42446
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/General/Header.coffee
src/General/css/font-awesome.css
src/Miscellaneous/CatalogLinks.coffee
2013-12-18 16:17:11 -07:00
Zixaphir
5d6b357135
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/script.js
src/General/lib/post.class
2013-12-18 12:21:43 -07:00