Zixaphir
d5fa356e2c
Merge branch 'master' of github.com:zixaphir/appchan-x
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
2014-03-06 20:46:08 -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
Brandon
b65db1ba7d
switch from .navLinks to .swfSauce on /f/
...
did this to not have it hide when ‘Hide Navlinks’ is enabled
2014-03-05 22:15:16 -08:00
Brandon
23a82cd795
a few more /f/ tweaks
...
It’s almost presentable! 🎈
2014-03-05 19:51:25 -08:00
Brandon
7dc1f8d600
/f/ cleanup
2014-03-05 13:57:43 -08:00
Brandon
2d3e935a34
Minor fix for /f/
...
Highlighted posts had an overlap with the highlighting and the fileInfo.
2014-03-05 13:36:10 -08:00
Zixaphir
7c28da181b
Fix ExpandThread without JSON Navigation
2014-03-03 12:41: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
811e3ccaf3
Use our implementation of Navigating between boards
...
Our custom navigation should now behave similar to Mayhem's, but
with JSON.
2014-02-28 18:56:02 -07:00
Mayhem
fba0571efb
rm dead code
2014-02-25 04:25:29 +01:00
Mayhem
c3fd98551a
Less <i>s.
2014-02-24 20:33:58 +01:00
Mayhem
5c6c0b7bd7
Use FontAwesome for the announcement hiding button.
2014-02-24 19:48:18 +01: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
58a3adeedb
Small CustomCSS optimization
2014-02-23 08:33:31 -07:00
Zixaphir
8fa130c2df
Backport @vampiricwulf's flash features
2014-02-23 08:32:06 -07:00
Zixaphir
5e10d45f4b
Give CustomCSS's style sheet an ID
2014-02-23 08:29:27 -07:00
Zixaphir
3a8ccfc237
Move Flash features into their own function
...
Also standardize code
2014-02-23 08:23:11 -07:00
Mayhem
498dfda2ef
Update code related to hidden threads.
2014-02-22 00:17:48 +01:00
Mayhem
61510ca272
Add {Post,Thread}::{hide,show}(). Merge reply hiding and thread hiding.
2014-02-22 00:17:47 +01:00
Zixaphir
7f69ba59fb
resolve #472 2
2014-02-16 04:25:29 -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
ahodesuka
c97112d0ee
Change ordering to be the same as the dropdown.
2014-02-12 02:21:08 -06:00
ahodesuka
1c47e1c197
Remove unneeded parentheses, change default keybindings, remove unneeded slice and filter.
2014-02-12 02:09:02 -06:00
ahodesuka
165fad8623
Add hotkeys for index modes.
2014-02-12 00:11:29 -06:00
Mayhem
ab739fd446
Add keybind to cycle through index sort types.
2014-02-11 10:13:53 +01:00
Kabir Sala
601312d9f6
Add OpenSUSE emoji
2014-02-10 15:44:48 +01:00
Mayhem
a234bdb2a5
Merge pull request #1412 from MayhemYDG/catalog
...
Drop support for the inline catalog
2014-02-05 18:03:40 +01:00
Mayhem
3d7097fffb
Screw supporting 4chan's inline features.
2014-02-05 16:11:04 +01:00
Mayhem
1aa467b051
Remove all inline catalog-related code.
2014-01-29 16:25:52 +01: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
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
Mayhem
508ab4f884
Make $.addClass/rmClass use multiple classes at once.
2014-01-21 15:30:47 +01:00
Mayhem
7495a905dd
Fix thread expanding.
...
Apparently an xhr's reponse is read-only.
2014-01-21 15:17:00 +01:00
Mayhem
710655f13e
Use xhr.responseType = 'json'.
2014-01-21 14:46:26 +01:00
Zixaphir
cc7decfd34
Merge branch 'v3'
2014-01-17 13:23:36 -07:00
Zixaphir
dc5daeba06
I really don't like iterating through objects.
2014-01-14 20:17:44 -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
seaweedchan
e5fd95158b
Start work on infinite scrolling
2014-01-12 01:15:31 -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
a20e85d30f
Features can *and should* handle under what context they disconnect
2014-01-11 12:03:50 -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
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
79cf8713a4
Add some stuff, hopefully should reduce errors
2014-01-09 23:10:32 -07:00
Zixaphir
af666d38cd
Merge branch 'v3'
...
Conflicts:
src/Posting/QuickReply.coffee
2013-12-24 16:32:48 -07:00
Zixaphir
8bad58920a
Fix not var in obj, var not in obj
2013-12-24 16:31:09 -07:00
Zixaphir
ae789f4ad8
Merge branch 'v3'
...
Conflicts:
LICENSE
builds/appchan-x.user.js
builds/crx/script.js
src/General/Index.coffee
src/General/Settings.coffee
src/General/lib/$.coffee
src/Posting/QuickReply.coffee
2013-12-24 16:18:47 -07:00
Zixaphir
91233b8d61
remove [].contains. It was a bad idea.
...
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
2013-12-24 14:41:21 -07:00
Zixaphir
61a9364090
Merge branch 'v3'
...
Conflicts:
builds/appchan-x.user.js
builds/crx/script.js
src/Miscellaneous/CatalogLinks.coffee
2013-12-18 16:58:07 -07:00