Commit Graph

900 Commits

Author SHA1 Message Date
Cinnamon 6f3a13d144
Merge pull request #325 from christianbundy/indexing-error-message
Indexing error message
2020-03-17 18:59:08 -07:00
Christian Bundy 64d60491b2
Merge pull request #327 from christianbundy/merge-316
Merge 316
2020-03-17 10:36:07 -07:00
Christian Bundy 122ed68a82 Merge commit 'refs/pull/316/head' of github.com:fraction/oasis 2020-03-17 10:22:22 -07:00
Christian Bundy e5df3a1497 Rename errorView() to indexingView()
Problem: Since the `errorView()` has a refresh we can probably just call
it `indexingView()` and add the indexing-specific code.

Solution:  Rename `errorView()` to `indexingView()` and add a progress
bar for it.
2020-03-17 07:41:57 -07:00
Christian Bundy 1f050b18a4 Add auto-refreshing error page on indexing error
Problem: The indexing message is being thrown as an error, which is
pasted as plaintext, so we can't do a page refresh. This is frustrating
when you're waiting for the indexes to finish because you have to
manually refresh a bunch while you wait.

Solution: Use the prototype from @justinabrahms to add an HTML message
for the indexing error and automatically refresh the page every ten
seconds.
2020-03-17 07:24:46 -07:00
Justin Abrahms 5c2d536d92 An html error message. 2020-03-16 20:25:43 -07:00
Christian Bundy 089291525e
Merge pull request #322 from justinabrahms/patch-1
Fix issue w/ mkdirp race condition
2020-03-16 14:46:48 -07:00
Justin Abrahms 84b2abc123
Fix issue w/ mkdirp race condition
Previously you would get this error due to imperfect path creation

```
node contrib/install-systemd-service.js
fs.js:114
    throw err;
    ^

Error: ENOENT: no such file or directory, copyfile '/home/justin/src/github.com/fraction/oasis/contrib/oasis.service' -> '/home/justin/.config/systemd/user/oasis.service'
    at Object.copyFileSync (fs.js:1728:3)
    at Object.<anonymous> (/home/justin/src/github.com/fraction/oasis/contrib/install-systemd-service.js:27:6)
    at Module._compile (internal/modules/cjs/loader.js:778:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:789:10)
    at Module.load (internal/modules/cjs/loader.js:653:32)
    at tryModuleLoad (internal/modules/cjs/loader.js:593:12)
    at Function.Module._load (internal/modules/cjs/loader.js:585:3)
    at Function.Module.runMain (internal/modules/cjs/loader.js:831:12)
    at startup (internal/bootstrap/node.js:283:19)
    at bootstrapNodeJSCore (internal/bootstrap/node.js:622:3)
```
2020-03-15 13:57:35 -07:00
Christian Bundy 0639201c3d
Merge pull request #317 from georgeowell/master
Added reference to "plain text" instead of just text
2020-03-12 12:57:14 -07:00
KawaiiPunk f032cbcc7f
Added reference to "plain text" instead of just text 2020-03-12 19:44:28 +00:00
Nick Wynja c3a4474256 Merge branch 'master' of https://github.com/fraction/oasis into threads 2020-03-11 23:22:11 -04:00
Cinnamon 54e95d1071
Merge pull request #277 from christianbundy/add-profile-image-upload
Add profile image upload
2020-03-11 17:45:09 -07:00
Christian Bundy a6c6f8ebab
Merge pull request #314 from fraction/cinnamon-bun-contributors-1
Rename AUTHORS to CONTRIBUTORS and add myself
2020-03-11 17:31:48 -07:00
Cinnamon dba544c9b5
Merge branch 'master' into add-profile-image-upload 2020-03-11 17:20:47 -07:00
Cinnamon fd67e212d0
Rename AUTHORS to CONTRIBUTORS and add myself
jump in everyone, the water's fine
2020-03-11 17:11:38 -07:00
Christian Bundy 504e9ba8fe
Merge pull request #312 from fraction/cinnamon-bun-maintainers-1
Add myself to MAINTAINERS
2020-03-11 16:29:28 -07:00
Cinnamon 363d4f869b
Add myself to MAINTAINERS 2020-03-11 16:16:36 -07:00
Cinnamon d2cdef8244
Merge pull request #299 from christianbundy/indexing-error
Present error message while waiting for indexing
2020-03-11 16:03:56 -07:00
Cinnamon 3e74a5cd2e
Merge pull request #298 from christianbundy/2019-03-npm-update
Upgrade npm dependencies
2020-03-11 16:02:09 -07:00
KawaiiPunk 4e27dd4b59
Added references to posts from yourself in Topics and Summaries 2020-03-11 21:54:22 +00:00
KawaiiPunk 836c5a06ed
Changed desription to mention that latest also includes posts from yourself 2020-03-11 21:47:40 +00:00
Christian Bundy 2c806af919
Merge pull request #311 from georgeowell/rearrange-settings
Rearrange settings
2020-03-11 07:10:34 -07:00
Christian Bundy 861dc76524
Merge pull request #309 from hng/feature/fix-popular-link
Fix link to popular view in navigation
2020-03-11 07:09:26 -07:00
Christian Bundy 228cab563d
Merge pull request #310 from georgeowell/view-thread-label
View thread label
2020-03-11 07:08:42 -07:00
Henning Schumann 076f5f21c1 Fixed link to popular view in navigation 2020-03-11 11:30:49 +01:00
KawaiiPunk 4232d0f05b
Moved peer connections to the top of settings 2020-03-11 09:26:02 +00:00
KawaiiPunk 850d1d2373
Rearranged settings in order of most likely use 2020-03-11 09:14:14 +00:00
KawaiiPunk daf82588ab
Tweaked edit your profile description to make it clearer 2020-03-11 08:55:29 +00:00
KawaiiPunk dc723595b4
Removed reference to "basic post" 2020-03-11 08:52:27 +00:00
KawaiiPunk e4dd883e2a
Changed reference to message to comment for consistency 2020-03-11 08:51:03 +00:00
Christian Bundy f3f8e3dda3
Merge pull request #307 from christianbundy/cherry-pick-2
finished spanish i18n
2020-03-10 20:16:50 -07:00
Christian Bundy 8cdeb809fd
Merge pull request #306 from christianbundy/cherry-pick-seekr
lands on /mentions instead of /public/popular/day
2020-03-10 20:15:24 -07:00
mario 8c3fc3f393 finished spanish i18n 2020-03-10 20:05:56 -07:00
mario cc4f6caef2 lands on /mentions instead of /public/popular/day 2020-03-10 20:02:00 -07:00
Christian Bundy c575aebb03 2.14.0 2020-03-10 16:57:46 -07:00
Christian Bundy 8738e6a83d
Merge pull request #302 from seekr/patch-1
Added more spanish translations
2020-03-10 11:06:47 -07:00
seekr 01f6366455
Merge pull request #2 from christianbundy/pr-302
Remove duplicate `search` in Spanish i18n
2020-03-10 14:52:22 -03:00
seekr fc2137381a
fix duplicate search for es 2020-03-10 14:49:47 -03:00
Christian Bundy 3595f06e79 Remove duplicate `search` in Spanish i18n
Problem: There are two `search` entries in the Spanish
internationalization.

Solution: Remove one of them!
2020-03-10 10:35:39 -07:00
seekr 2117b9f76b
more updates to spanish 2020-03-10 11:31:27 -03:00
seekr 8fbbdaaaf4
started adding spanish translations 2020-03-10 10:01:06 -03:00
Nick Wynja 7e601ae35a Adds Threads view for seeing wider conversation 2020-03-10 08:42:56 -04:00
Christian Bundy d97cd9a351
Merge pull request #281 from fraction/cinnamon-bun-patch-2
README: add FAQ about running alongside other SSB apps
2020-03-09 15:19:56 -07:00
Christian Bundy f2cf067b67 Present error message while waiting for indexing
Problem: When our views are still indexing the database they apparently
don't respond over MuxRPC, which means that we're just waiting forever
until they finish. This means that people who are indexing the database
get an HTTP response that might take an hour to finish.

Solution: If we have more than 1 mebibyte of backlog, present an error
message explaining the situation and asking for a bit of patience.
2020-03-09 15:14:28 -07:00
Christian Bundy 81909a2584 Appease linter
Problem: Linter is complaining about the previous commit.

Solution: `npm run fix`.
2020-03-09 15:07:49 -07:00
Christian Bundy 9b193cda14 Upgrade npm dependencies
Problem: Patchwork is soon going to release with a new SSB-Backlinks,
and since we share a database with Patchwork we should make sure we're
on the same version. If we're on different versions, we'll be constantly
regenerating indexes and that isn't fun for anyone.

Solution: Upgrade npm dependencies.
2020-03-09 14:34:18 -07:00
Christian Bundy d97c04d93f
Merge pull request #295 from hng/feature/small-i18n-improvements
Small i18n improvements
2020-03-09 07:20:07 -07:00
Henning Schumann 15417422a4 Made "private/public" comment translatable 2020-03-09 12:19:01 +01:00
Henning Schumann 314033cdd0 Made content warning text field placeholder translatable 2020-03-09 11:57:21 +01:00
Christian Bundy a2e7f4ad6d
Merge pull request #293 from hng/feature/translations-de
Add German translations
2020-03-08 17:57:46 -07:00