Commit Graph

4980 Commits

Author SHA1 Message Date
jeff
58a25602f5 more fixes, implemenmt missing functions 2019-10-09 09:08:38 -04:00
jeff
d80633a975 typo fix 2019-10-09 08:43:25 -04:00
jeff
043bf505bc typofix 2019-10-09 08:42:05 -04:00
jeff
9a49c77647 cast 2019-10-09 08:41:34 -04:00
jeff
bcf792d772 more fixups 2019-10-09 08:40:40 -04:00
jeff
4c584dd2da pass template arguments in, fix typo 2019-10-09 08:16:57 -04:00
jeff
7823fd5084 typofix 2019-10-09 08:13:40 -04:00
jeff
6202baf5b1 fix cmakelists.txt file paths 2019-10-09 08:13:04 -04:00
jeff
1b0d0575ca try making it compile 2019-10-09 08:12:08 -04:00
jeff
c26b67c379 finish wiring up jni shizz 2019-10-08 10:52:01 -04:00
jeff
7d7c6bf38c Merge remote-tracking branch 'upstream/dev' into multithreaded-cryptography 2019-10-07 06:08:47 -04:00
jeff
313898999d initial jni wrapper stuff 2019-10-07 06:05:12 -04:00
Jeff
a0aea73bcb
Merge pull request #856 from michael-loki/cmake_exe
Split cmake files for executables into respective source dirs
2019-10-07 05:55:39 -04:00
Michael
77b4efd78b
fixup ios 2019-10-07 00:52:04 +01:00
Michael
394f3e6943
More CI fixes 2019-10-06 22:30:23 +01:00
Michael
07927746b8
Fix makefile location 2019-10-05 17:49:10 +01:00
michael-loki
4b6dab5651
Fixup 2019-10-05 17:06:35 +01:00
Michael
abc527ca35
Split cmake files for executables into src dirs 2019-10-05 16:08:12 +01:00
Jeff
7780fe0278
Merge pull request #855 from michael-loki/background_mode
Introduce --background to only start JSON RPC
2019-10-04 15:58:08 -04:00
Michael
f326c93b5b
Apply Jeff's comments 2019-10-04 20:43:30 +01:00
jeff
6dc350a8f3 update cmake 2019-10-04 14:16:39 -04:00
jeff
52757fef0e Merge remote-tracking branch 'micheal/background_mode' into vpn-api-2019-10-03 2019-10-04 14:10:58 -04:00
Michael
15cb49c9bd
Introduce --background to only start JSON RPC
fixes #853
2019-10-04 10:32:52 +01:00
jeff
4371901e70 flesh out vpn c api
clean up cruft
2019-10-03 09:54:21 -04:00
Jeff
1af9ae255e
Merge pull request #852 from michael-loki/rcp_version
Support version over jsonrpc
2019-10-02 19:00:49 -04:00
Michael
d467e2618b
Support version over jsonrcp 2019-10-02 22:53:56 +01:00
Jeff
b8239a3c23
Merge pull request #851 from notlesh/add_version_cli_arg
Add a --version flag to lokinet CLI args
2019-10-02 15:29:10 -04:00
Stephen Shelton
c9b862a12b Add a --version flag to lokinet CLI args 2019-10-02 12:08:45 -06:00
jeff
1e57397c99 revert to c++14 for non win32 2019-10-02 11:40:26 -04:00
jeff
4af6dca246 use static_cast 2019-10-02 11:35:33 -04:00
jeff
7d949ebf5d always use absl for string_view 2019-10-02 11:35:20 -04:00
jeff
605da68e15 use absl optional 2019-10-02 09:17:12 -04:00
jeff
3c1d5518d8 fix windows port and make it compile 2019-10-02 09:06:14 -04:00
jeff
c3451fc77a remove log level change 2019-10-01 11:06:56 -04:00
jeff
da9437d0cf don't need that 2019-10-01 11:05:37 -04:00
jeff
32ed821763 Merge remote-tracking branch 'upstream/dev' into multithreaded-cryptography 2019-10-01 10:51:28 -04:00
Jeff
8f46a62aa6
Merge pull request #847 from michael-loki/ios_wip
Distinct ios build
2019-09-30 15:00:17 -04:00
michael-loki
dd63a7c84b
Make Travis happy 2019-09-30 15:12:28 +01:00
Jeff
a50c80070c
Merge pull request #848 from michael-loki/ui-macos_rework
Improvements to macOS app workflow
2019-09-30 08:29:28 -04:00
Jeff
1558f9af4c
Merge pull request #844 from michael-loki/xcode_harden
Use a hardened build for macOS release
2019-09-30 07:54:44 -04:00
Jeff
0aab04d1b2
Merge pull request #843 from michael-loki/fix_static_link
Fix static link with gcc
2019-09-30 07:54:30 -04:00
Michael
db20c12b05
Improvements to app workflow 2019-09-30 10:19:29 +01:00
Michael
89f039d69b
Use a hardened build for macOS release 2019-09-30 10:04:22 +01:00
Michael
fadedb4a7b
Distinct ios build 2019-09-30 09:59:34 +01:00
Jeff
48db4c4a1c
Merge pull request #825 from despair86/dev
remove binaries from source tree
2019-09-25 10:38:18 -04:00
Jeff
3c2b2ce34d
Merge branch 'dev' into dev 2019-09-25 10:37:57 -04:00
Michael
50c67cb7a2
Use a hardened build for macOS release 2019-09-25 10:10:25 +01:00
michael-loki
0becc84eb5
Merge pull request #828 from michael-loki/ui-macos
Add initial macOS app
2019-09-24 11:11:41 +01:00
Michael
a5858c770f
Fix static link with gcc 2019-09-24 09:29:11 +00:00
Michael
5f0bb6fbd1
Try to fix windows build 2019-09-24 09:51:54 +01:00