Commit Graph

813 Commits

Author SHA1 Message Date
Christian Bundy 9ee58369cc Add .mailmap for canonical identities
Problem: Some of us have a few different emails, which show up as
different people when we commit. It would be great to merge these Git
identities so that they don't show up as different people.

Solution: Use `.mailmap`, which lets people choose their favorite
canonical email address for this project.
2020-03-24 16:59:20 -07:00
Christian Bundy e0a20e4915 Merge commit 'd9e8' 2020-03-24 14:45:33 -07:00
Jonathan Dahan af19f5f24e
Merge pull request #340 from christianbundy/npm-update-march-23
Update npm dependencies
2020-03-24 17:36:10 -04:00
Nick Wynja d9e829e2e8 Removes husky to fix #346 2020-03-24 15:19:33 -04:00
Christian Bundy 11c413d447 Merge branch 'master' of github.com:fraction/oasis into npm-update-march-23 2020-03-24 12:09:39 -07:00
Christian Bundy 519fc499ac
Merge pull request #343 from nickwynja/theme-config
Load theme using existing config mechanisms
2020-03-24 11:25:27 -07:00
Nick Wynja a4b00696ab Load theme using existing config mechanisms
This allow someone to pass in the theme as a command line arg or set the
theme in defaults.json, while still allowing someone to set the theme on
a per-browser basis as a cookie.
2020-03-24 14:11:27 -04:00
Christian Bundy f64a512e52
Merge pull request #335 from christianbundy/fix-private-message
Fix crash when linking directly to private message
2020-03-24 09:35:01 -07:00
Christian Bundy 72eec63e1a
Merge pull request #251 from christianbundy/add-build-script
Add build script that creates zip files
2020-03-24 09:34:23 -07:00
Christian Bundy dd388feefe Revert @fraction/flotilla change 2020-03-24 08:15:05 -07:00
Christian Bundy 488852f205 Resolve Travis CI + Windows EOL bug
Problem: Travis CI is converting our EOL characters and it's causing
problems when we're parsing with Prettier.

Solution: Disable auto-conversion.
2020-03-23 19:20:38 -07:00
Christian Bundy 32465e5983 Update npm dependencies
Problem: Our dependencies are falling behind and it'd be nice to have
them up-to-date. The only big update it that Common-Good upgraded to the
latest version of Prettier.

Solution: Update them!
2020-03-23 18:59:53 -07:00
Christian Bundy 8c71d93ab3
Merge pull request #337 from justinabrahms/master
Actually shift cards over, rather than just a minor indent.
2020-03-23 09:02:13 -07:00
Justin Abrahms b5d37c7c8d Actually shift cards over, rather than just a minor indent. 2020-03-21 20:09:28 -07:00
Christian Bundy bdcc127674 Fix crash when linking directly to private message
Problem: Trying to view a private message crashes the server and leaks a
bunch of memory. That's bad. This problem is caused by faulty handling
in the function that finds thread ancestors. There's some code that says
"if the next ancestor is a private message, just return the ancestors
that we know about", which returns nothing when we're looking up a
private post (because we can't identify *any* ancestors).

Solution: Ensure that we're only resolving the promise once in the
function by chaining `else if`s and ensure that we only return the
ancestor list if there are actually ancestor in it. If the ancestor list
is empty, we can just return the single message that we know about and
pass it off.
2020-03-20 11:33:18 -07:00
Christian Bundy 7ad7f5bb7a
Merge pull request #332 from georgeowell/update-readme
Added patchbay to same time server list
2020-03-19 07:07:49 -07:00
KawaiiPunk 34b5047770
Added patchbay to same time server list 2020-03-19 04:05:20 +00:00
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
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