Skip to content
This repository has been archived by the owner on Mar 9, 2023. It is now read-only.

Unified daemons into one #23

Merged
merged 28 commits into from
Jan 14, 2020
Merged

Unified daemons into one #23

merged 28 commits into from
Jan 14, 2020

Conversation

neuroscr
Copy link
Contributor

@neuroscr neuroscr commented Dec 30, 2019 •
edited
Loading

  • add nodepomf submodule and it's dialect
  • overlay_server.js now just loads server/app with a specific config.json to make this all work
  • we need to fix absolute URL issue in messenger clients

we probably can bring letsencrypt into node now

@neuroscr
include nodepomf submodule, bump submodule versions
95ab706
@neuroscr
improve log msg
b51e4fc
@neuroscr
unify it
ba5967c
@neuroscr
unified config file and nodepomf dialect
b56c6f1
@neuroscr
unfied config
e9631a8
@neuroscr
add overlay variables
8659f72
@neuroscr
pass next for 404s
1b43219
@neuroscr
Unified version
b465483
@neuroscr
bump server version to fix config path
8e6da48
@neuroscr
Merge branch 'master' of https://github.com/loki-project/loki-messeng…
4be14c8 
…er-public-server into unified
@neuroscr
move sqlite3 bump into repo
8255bde
@neuroscr
update travis to expect a unified set up
f2c7054
@neuroscr
set port to be the unified default
2187176
@neuroscr
update tests to be unified
4d42996
@neuroscr
Merge branch 'unified' of https://github.com/neuroscr/loki-messenger-…
eb0864c 
…public-server into unified
@neuroscr
create missing directory, make NPOMF_UPLOAD_DIRECTORY absolute outsid…
7f9dfa2 
…e of route
@neuroscr
only call static builder once, include fs, style fixes
96b1f09
@neuroscr
disable redis for unit tests
26cb43e
@neuroscr
add back preflight
76b3bdc
@neuroscr
minor improvements and debug
2197c2e
@neuroscr
fix dockerfile for newer package.json in nodepomf
f9d31d4
@neuroscr
merged config mods correctly
6ef0b0d
@neuroscr
fix spacing in logging
17b9ec9
@neuroscr
make getUsers handle usernames and ids
a175c05
@neuroscr
convert instructions to unified
d12cd6d
@neuroscr
bump submodule versions
759fe42
@neuroscr
run unit-tests, make sure local node-modules don't interfere
d23da14
@neuroscr
Merge branch 'unified' of https://github.com/neuroscr/loki-messenger-…
61d8551 
…public-server into unified
@neuroscr neuroscr merged commit 3274068 into oxen-io:master Jan 14, 2020
@neuroscr neuroscr deleted the unified branch January 14, 2020 05:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@neuroscr