Commit Graph

983 Commits

Author SHA1 Message Date
Christian Bundy a5d5e446c7 Refactor Docker example
Problem: The Docker example was using Alpine with the Tini dependency
and some neat custom stuff, but it wasn't super clear to understand
everything that was going on. It was also slow because lots of stuff was
compiling from source.

Solution: Replace neat custom stuff with boring defaults for clarity and
much faster builds.
2020-05-10 13:52:47 -07:00
Sean Billig 58765f8b0e
Merge pull request #425 from Powersource/image-search
Image search
2020-05-07 08:44:44 -07:00
Jacob Karlsson c205826b48 Merge branch 'master' of github.com:fraction/oasis into image-search 2020-05-06 20:05:37 +02:00
Nick Wynja 41d436b8f0
Merge pull request #427 from christianbundy/conn-hops
Upgrade Flotilla and SSB-CONN, remove auto-stage
2020-05-04 16:57:45 -04:00
Christian Bundy 8e30c93de8 Fix 'cannot set autostart of undefined'
Problem: `customConfig.conn` isn't defined.

Solution: Use `lodash.set()`.
2020-05-04 13:44:00 -07:00
Christian Bundy f86b73b40e Upgrade Flotilla and SSB-CONN, remove auto-stage
Problem: The auto-stage code was a horrible hack that may be causeing an
OOM bug if too many peers are staged too quickly.

Solution: Since SSB-CONN now supports a variable number of connection
hops, we can remove the auto-stage hack and use the default scheduler
instead of trying to staple on our own hacky scheduler fix.
2020-05-04 13:27:06 -07:00
Jacob Karlsson 3b753f16ac Apply style fixes 2020-05-03 23:14:19 +02:00
Jacob Karlsson f63a0dfa0a Add i18n for image search 2020-05-03 23:02:44 +02:00
Jacob Karlsson 51ae2966f1 Add sidebar entry 2020-05-03 22:38:34 +02:00
Jacob Karlsson e456c1d9c5 Add image search 2020-05-03 22:16:44 +02:00
Nick Wynja 87c46061b7
Merge pull request #410 from christianbundy/fix-summary-style
Fix summary style
2020-04-16 21:01:30 -04:00
Cinnamon ec1616d985
Merge pull request #414 from christianbundy/rename-to-subtopic
Rename "reply" to "subtopic"
2020-04-16 11:36:02 -07:00
Christian Bundy 8e2eb404e0 Rename "reply" to "subtopic"
Problem: The words "comment" and "reply" are super ambiguous, but
renaming them is hard.

Solution: I think "subtopic" captures the sentiment well, and makes it
clear that you're leaving the current topic to start a new topic (rather
than just replying to an individual message).
2020-04-16 08:31:35 -07:00
Christian Bundy 031a0efd61 Remove dashed summary style from indented summary
Problem: The indented summary took up lots of visual attention which
isn't what we wanted. Also a bad merge broke the previous `<summary>`/

Solution: Fix the bad merge and remove the dashes style from the
indented summary elements.
2020-04-15 07:27:23 -07:00
Christian Bundy 0ef45c7249 Merge branch 'master' of github.com:fraction/oasis into fix-summary-style 2020-04-15 07:14:24 -07:00
Cinnamon 2867d05b75
Merge pull request #411 from christianbundy/no-metric-css
Replace "metric CSS" with --size-N
2020-04-14 18:00:43 -07:00
Christian Bundy 02571d4d90 Merge branch 'master' of github.com:fraction/oasis into fix-summary-style 2020-04-14 13:21:01 -07:00
Nick Wynja 7314b3e716
Merge pull request #408 from christianbundy/fix-allow-host-preset
Fix allow-host preset not working correctly
2020-04-14 16:19:07 -04:00
Nick Wynja fcf0b152cc
Merge pull request #409 from christianbundy/simple-sync
Add timeout to sync and refactor
2020-04-14 16:05:30 -04:00
Christian Bundy 3be8ff92c4 Replace "metric CSS" with --size-N
Problem: The "metric CSS" was kind of clever but mostly just confusing.

Solution: Use `--size-N` for the size, where the size is `2^n`. Double
size is `--size-1`, half size is `--size--1` (negative one). The
negatives kind of suck but I couldn't think of a better solution that
didn't give up the flexibility, brevity, or the ability to sort
alphabetically.

Fixes: https://github.com/fraction/oasis/issues/100
2020-04-14 12:19:38 -07:00
Christian Bundy 2eb983719c Fix summary style
Problem: the `<summary>` element had a broken bottom margin on content
warnings, and isn't obvious that it's not just text.

Solution: Fix the margin and used a dashed border to indicate that the
content can be expanded. I think this is more intuitive than no border,
and I think the dashed line draws parallels with "cut outs" that might
make expansion intuitive (?), but either way I think it's better than
the previous design.
2020-04-14 11:52:42 -07:00
Christian Bundy ef53618543 Run linter
Problem: I always forget to run the linter. I should probably add this
as a personal git-hook.

Solution: `npm run fix`.
2020-04-14 11:36:25 -07:00
Christian Bundy ce8c15a6eb Add timeout to sync and refactor
Problem: The sync goes forever, which isn't good if we're in an edge
case (like having peers who are offline with us).

Solution: Add a 5-minute timeout and refactor to use a design that's
maybe simpler? This is just my stab at the previous behavior, but there
are definitely improvements that could be made!
2020-04-14 11:32:58 -07:00
Christian Bundy 8ccfb1a1ec Fix allow-host preset not working correctly
Problem: The preset for allow-host is coming from "host".

Solution: Make the preset for allow-host come from "allow-host".
2020-04-14 10:53:23 -07:00
Christian Bundy 1b6c559115
Merge pull request #403 from nickwynja/sync
Introduces sync endpoint
2020-04-14 10:39:01 -07:00
Nick Wynja d9423b17e4 Use target for progress checks 2020-04-14 12:55:29 -04:00
Nick Wynja 2ecfee4a24 Clean up 2020-04-14 08:08:10 -04:00
Nick Wynja eaf8a9d713 Lint fix 2020-04-14 08:03:27 -04:00
Nick Wynja ed12afbb91 Refactor peer checking
Split peers and peers connected and add function to disconnect
2020-04-14 07:57:31 -04:00
Christian Bundy 6fb1da68eb
Merge pull request #407 from christianbundy/release-2.16.0
2.16.0
2020-04-13 14:47:28 -07:00
Nick Wynja f3eac9fff8 Lint fix 2020-04-13 17:35:42 -04:00
Christian Bundy 09ff4cad21 2.16.0 2020-04-13 14:32:21 -07:00
Nick Wynja a896f637e5 Progress checking and connected peers
Rework how I'm doing progress checking and be very verbose about it
until I understand how this all works. Also refactors connected peer
function into shared model for use on settings page.
2020-04-13 17:27:03 -04:00
Christian Bundy 91251b1fa5
Merge pull request #406 from cinnamon-bun/offline-warning-message
Change offline warning message
2020-04-13 14:25:06 -07:00
Cinnamon c30b0fc0fd
Change warning message about offline mode
The warning message talked about "pre-existing servers" which might not make sense to everyone.
2020-04-13 14:14:08 -07:00
Cinnamon 939052db4e
Merge pull request #1 from fraction/master
merge from fraction/oasis
2020-04-13 14:09:41 -07:00
Nick Wynja e392b68d1f Merge remote-tracking branch 'upstream/master' into sync 2020-04-13 16:09:03 -04:00
Nick Wynja 796da05931
Merge pull request #405 from christianbundy/enable-fr
Add Français (FR) to the language drop-down
2020-04-13 16:05:16 -04:00
Nick Wynja f0adeb7a4b Merge remote-tracking branch 'upstream/master' into sync 2020-04-13 15:50:54 -04:00
Nick Wynja 016bbabc24
Merge pull request #395 from christianbundy/start-ssb-immediately
Start SSB service immediately instead of waiting
2020-04-13 15:50:15 -04:00
Nick Wynja 82bfcfa350 Merge remote-tracking branch 'upstream/master' into sync 2020-04-13 15:48:54 -04:00
Christian Bundy 69ee3f1611 Resolve ensureConnection() race condition
Problem: If you call `ensureConnection()` two times really fast, it'll
spin off two separate connection attempts, each with their own socket,
which keeps the tests from closing.

Solution: If there's a pending connection, keep track of it, and only
attempt a new connection if there are no pending connections.
2020-04-13 11:48:41 -07:00
Jonathan Dahan 18f5d661fb
Merge pull request #402 from christianbundy/server-on-listening
Replace setImmediate() with .on('listening')
2020-04-13 13:29:39 -04:00
Christian Bundy 81c03bebde Add Français (FR) to the language drop-down
Problem: The FR translation is added in `i18n.js` but it's not available
in the drop-down language selection menu.

Solution: Add it to the menu and ensure that the menu is sorted
alphabetically by the name of the language.
2020-04-13 10:24:01 -07:00
Christian Bundy 40292a74e1
Merge pull request #394 from zicmama/master
Added french "fr" translation
2020-04-13 10:14:55 -07:00
Cinnamon 8fdf2cda21
Merge pull request #404 from fraction/fix-tpo-typo
Fix "tpo" typo
2020-04-13 09:55:04 -07:00
Fred e0904dae8c
Merge pull request #1 from christianbundy/npm-fix-fr
Run `npm run fix`
2020-04-13 18:46:41 +02:00
Christian Bundy 9f08a24053 If open() is called during close(), close server
Problem: I think that if `open()` is called after `close()`, it keeps a
server open. This keeps the tests running forever.

Solution: Just before `open()` resolves, check `closing` and [if
necessary] close the server that we just started by re-calling
`close()`.
2020-04-13 09:20:48 -07:00
Christian Bundy 1985e8898c Run `npm run fix`
Problem: The linter was throwing lots of un-fun errors.

Solution: `npm run fix` to resolve them.
2020-04-13 09:11:04 -07:00
Christian Bundy 41cf751389
Fix "tpo" typo
Problem: I wrote "tpo". I meant "typo".

Solution: Fix the tpo.
2020-04-13 09:03:37 -07:00