Commit Graph

1316 Commits

Author SHA1 Message Date
Nick Wynja 4e8f7426a4 Merge branch 'master' of https://github.com/fraction/oasis into subscribed-channels 2021-03-03 13:49:10 -05:00
Nick Wynja 398ebe9271 Adds subscribed channels to Topics
Any subscribed channels now appear at the top of Topics. This gives you
easy access to view subscribed channels using the existing hashtags
view.
2021-03-03 13:36:23 -05:00
Christian Bundy 80e231b82e
Merge pull request #625 from fraction/dependabot/npm_and_yarn/open-8.0.1
Bump open from 7.4.2 to 8.0.1
2021-03-03 08:54:33 -08:00
Christian Bundy e45f115bbf
Merge pull request #624 from nickwynja/blocking
Hides content of messages from blocked people
2021-03-03 08:53:34 -08:00
dependabot[bot] 42dd163479
Bump open from 7.4.2 to 8.0.1
Bumps [open](https://github.com/sindresorhus/open) from 7.4.2 to 8.0.1.
- [Release notes](https://github.com/sindresorhus/open/releases)
- [Commits](https://github.com/sindresorhus/open/compare/v7.4.2...v8.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-03 05:05:14 +00:00
Nick Wynja 31e5ae37d5 Hides content of messages from blocked people
This introduces a basic implementation to not display the content of
messages. It still shows that a message exists but shows localized
copy indicating why the content was hidden.

We should consider additional filters or queries in different views to actually
remove these posts but I'll leave that as up for discussion since I can see
value in showing that a blocked comment exists in a conversation.
2021-03-02 17:47:28 -05:00
Christian Bundy e8bb3e3fe8
Merge pull request #621 from fraction/dependabot/npm_and_yarn/ssb-conn-2.0.0
Bump ssb-conn from 1.0.0 to 2.0.0
2021-03-01 09:19:04 -08:00
Christian Bundy b461b1a3b0
Merge pull request #620 from fraction/dependabot/npm_and_yarn/husky-5.1.2
Bump husky from 5.1.1 to 5.1.2
2021-03-01 09:11:51 -08:00
dependabot[bot] 09afb54272
Bump ssb-conn from 1.0.0 to 2.0.0
Bumps [ssb-conn](https://github.com/staltz/ssb-conn) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/staltz/ssb-conn/releases)
- [Changelog](https://github.com/staltz/ssb-conn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/staltz/ssb-conn/compare/v1.0.0...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-01 05:15:12 +00:00
dependabot[bot] d5686eb456
Bump husky from 5.1.1 to 5.1.2
Bumps [husky](https://github.com/typicode/husky) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v5.1.1...v5.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-01 05:13:46 +00:00
Christian Bundy 26b1e5c9b2
Merge pull request #619 from fraction/dependabot/npm_and_yarn/ssb-lan-1.0.0
Bump ssb-lan from 0.2.0 to 1.0.0
2021-02-25 08:53:00 -08:00
dependabot[bot] 931e1b2593
Bump ssb-lan from 0.2.0 to 1.0.0
Bumps [ssb-lan](https://github.com/staltz/ssb-lan) from 0.2.0 to 1.0.0.
- [Release notes](https://github.com/staltz/ssb-lan/releases)
- [Commits](https://github.com/staltz/ssb-lan/compare/v0.2.0...v1.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-25 05:04:47 +00:00
Christian Bundy 1726e40b8a
Merge pull request #612 from fraction/dependabot/npm_and_yarn/types/koa-2.13.0
Bump @types/koa from 2.11.8 to 2.13.0
2021-02-23 07:48:01 -08:00
Christian Bundy 86cf98c157
Merge pull request #617 from fraction/dependabot/npm_and_yarn/sharp-0.27.2
Bump sharp from 0.27.1 to 0.27.2
2021-02-23 07:39:37 -08:00
Christian Bundy 63f71727a3
Merge pull request #618 from fraction/dependabot/npm_and_yarn/husky-5.1.1
Bump husky from 5.1.0 to 5.1.1
2021-02-23 07:39:20 -08:00
dependabot[bot] 9a79cb6176
Bump husky from 5.1.0 to 5.1.1
Bumps [husky](https://github.com/typicode/husky) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v5.1.0...v5.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-23 05:05:56 +00:00
dependabot[bot] 7d69e4a0c7
Bump sharp from 0.27.1 to 0.27.2
Bumps [sharp](https://github.com/lovell/sharp) from 0.27.1 to 0.27.2.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/master/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.27.1...v0.27.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-23 05:04:40 +00:00
Christian Bundy 9c095f3147
Merge pull request #615 from fraction/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21
2021-02-22 07:52:21 -08:00
Christian Bundy 648ce71dcd
Merge pull request #616 from fraction/dependabot/npm_and_yarn/husky-5.1.0
Bump husky from 5.0.9 to 5.1.0
2021-02-22 07:52:05 -08:00
dependabot[bot] 4a624b2a0a
Bump husky from 5.0.9 to 5.1.0
Bumps [husky](https://github.com/typicode/husky) from 5.0.9 to 5.1.0.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v5.0.9...v5.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-22 05:05:53 +00:00
dependabot[bot] 08f52b6297
Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-22 05:05:10 +00:00
Jacob Karlsson 1ad14c70d3
Merge pull request #603 from SomaRasu/110/dislikes-on-likes-page
updating code for likes page bug
2021-02-21 18:12:09 +01:00
dependabot[bot] 5025de612e
Bump @types/koa from 2.11.8 to 2.13.0
Bumps [@types/koa](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa) from 2.11.8 to 2.13.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 05:04:57 +00:00
Christian Bundy 14b8c082bb
Merge pull request #608 from fraction/dependabot/npm_and_yarn/open-7.4.2
Bump open from 7.4.1 to 7.4.2
2021-02-17 07:48:48 -08:00
Christian Bundy fa98ae4e12
Merge pull request #609 from fraction/dependabot/npm_and_yarn/ssb-friends-4.4.4
Bump ssb-friends from 4.4.3 to 4.4.4
2021-02-17 07:48:44 -08:00
dependabot[bot] de279c28fa
Bump ssb-friends from 4.4.3 to 4.4.4
Bumps [ssb-friends](https://github.com/ssbc/ssb-friends) from 4.4.3 to 4.4.4.
- [Release notes](https://github.com/ssbc/ssb-friends/releases)
- [Commits](https://github.com/ssbc/ssb-friends/compare/v4.4.3...4.4.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-17 05:05:55 +00:00
dependabot[bot] de96a36f0f
Bump open from 7.4.1 to 7.4.2
Bumps [open](https://github.com/sindresorhus/open) from 7.4.1 to 7.4.2.
- [Release notes](https://github.com/sindresorhus/open/releases)
- [Commits](https://github.com/sindresorhus/open/compare/v7.4.1...v7.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-17 05:04:23 +00:00
Christian Bundy 93b7ba4b21
Merge pull request #605 from fraction/dependabot/npm_and_yarn/types/koa-2.11.8
Bump @types/koa from 2.11.7 to 2.11.8
2021-02-16 07:37:48 -08:00
Christian Bundy 2919e2d5d6
Merge pull request #606 from fraction/dependabot/npm_and_yarn/open-7.4.1
Bump open from 7.4.0 to 7.4.1
2021-02-16 07:37:41 -08:00
dependabot[bot] 5eef74c72c
Bump open from 7.4.0 to 7.4.1
Bumps [open](https://github.com/sindresorhus/open) from 7.4.0 to 7.4.1.
- [Release notes](https://github.com/sindresorhus/open/releases)
- [Commits](https://github.com/sindresorhus/open/compare/v7.4.0...v7.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-15 05:07:09 +00:00
dependabot[bot] b43b868f3a
Bump @types/koa from 2.11.7 to 2.11.8
Bumps [@types/koa](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa) from 2.11.7 to 2.11.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-15 05:05:42 +00:00
Soma 519d0e55f0 fix linting issues 2021-02-13 07:33:28 -08:00
Soma c05023e0dd updating code for likes page bug 2021-02-13 07:23:26 -08:00
Jacob Karlsson a7f0f9ab2c
Merge pull request #601 from Roxxers/chore/mention-oasis-desktop
mention oasis-desktop in the README
2021-02-09 22:01:21 +01:00
Christian Bundy 1ea64b288e
Merge pull request #599 from fraction/dependabot/npm_and_yarn/husky-5.0.9
Bump husky from 4.3.8 to 5.0.9
2021-02-09 11:43:07 -08:00
dependabot[bot] 99c59e101a
Bump husky from 4.3.8 to 5.0.9
Bumps [husky](https://github.com/typicode/husky) from 4.3.8 to 5.0.9.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v4.3.8...v5.0.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-09 17:52:36 +00:00
Christian Bundy 1b5553c329
Merge pull request #598 from fraction/dependabot/npm_and_yarn/highlight.js-10.6.0
Bump highlight.js from 10.5.0 to 10.6.0
2021-02-09 09:50:09 -08:00
Christian Bundy ec01ed40c5
Merge pull request #597 from fraction/dependabot/npm_and_yarn/ssb-friends-4.4.3
Bump ssb-friends from 4.3.0 to 4.4.3
2021-02-09 09:50:02 -08:00
Roxie Gibson 6eac0ce808
chore: mention oasis-desktop in the README
Fixes #575
2021-02-09 10:00:43 +00:00
dependabot[bot] 0d21b99a95
Bump highlight.js from 10.5.0 to 10.6.0
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.5.0 to 10.6.0.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.5.0...10.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-09 05:05:26 +00:00
dependabot[bot] 9355f575b2
Bump ssb-friends from 4.3.0 to 4.4.3
Bumps [ssb-friends](https://github.com/ssbc/ssb-friends) from 4.3.0 to 4.4.3.
- [Release notes](https://github.com/ssbc/ssb-friends/releases)
- [Commits](https://github.com/ssbc/ssb-friends/compare/v4.3.0...v4.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-09 05:04:01 +00:00
Christian Bundy d20e70bf44
Merge pull request #595 from fraction/dependabot/npm_and_yarn/open-7.4.0
Bump open from 7.3.1 to 7.4.0
2021-02-02 07:26:59 -08:00
dependabot[bot] 1b5a6d4211
Bump open from 7.3.1 to 7.4.0
Bumps [open](https://github.com/sindresorhus/open) from 7.3.1 to 7.4.0.
- [Release notes](https://github.com/sindresorhus/open/releases)
- [Commits](https://github.com/sindresorhus/open/compare/v7.3.1...v7.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-02 05:05:06 +00:00
Christian Bundy bde67c5077
Merge pull request #588 from fraction/dependabot/npm_and_yarn/types/koa-2.11.7
Bump @types/koa from 2.11.6 to 2.11.7
2021-02-01 08:11:59 -08:00
dependabot[bot] ffec0c9706
Bump @types/koa from 2.11.6 to 2.11.7
Bumps [@types/koa](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa) from 2.11.6 to 2.11.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-01 15:56:17 +00:00
Christian Bundy a7544659e6
Merge pull request #587 from fraction/dependabot/npm_and_yarn/sharp-0.27.1
Bump sharp from 0.27.0 to 0.27.1
2021-02-01 07:53:55 -08:00
Christian Bundy ec56978ed2
Merge pull request #593 from fraction/dependabot/npm_and_yarn/ssb-keys-8.0.2
Bump ssb-keys from 8.0.1 to 8.0.2
2021-02-01 07:49:56 -08:00
dependabot[bot] a8f819d3d8
Bump ssb-keys from 8.0.1 to 8.0.2
Bumps [ssb-keys](https://github.com/ssbc/ssb-keys) from 8.0.1 to 8.0.2.
- [Release notes](https://github.com/ssbc/ssb-keys/releases)
- [Changelog](https://github.com/ssb-js/ssb-keys/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ssbc/ssb-keys/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-01 05:17:59 +00:00
dependabot[bot] 942f9f4174
Bump sharp from 0.27.0 to 0.27.1
Bumps [sharp](https://github.com/lovell/sharp) from 0.27.0 to 0.27.1.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/master/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.27.0...v0.27.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-29 17:47:14 +00:00
Christian Bundy ae85340190
Merge pull request #590 from fraction/dependabot/npm_and_yarn/types/yargs-16.0.0
Bump @types/yargs from 15.0.12 to 16.0.0
2021-01-29 09:44:47 -08:00