Commit Graph

5619 Commits

Author SHA1 Message Date
felisucoibi
ff9c7774f2
Update hash_cache.cc 2019-12-01 12:28:52 +01:00
Gioacchino Mazzurco
610fedabb8
Fix JSON API related files licensing based on talk with Cyril and FSFE suggestions 2019-11-29 19:46:46 +01:00
Gioacchino Mazzurco
ba4af74a06
Add reminder to rsversion.h that no C++ includes are admitted 2019-11-28 18:22:01 +01:00
Gioacchino Mazzurco
5bf8792bc5
Fix windows compile due to rsversion JSON API 2019-11-28 17:41:03 +01:00
Gioacchino Mazzurco
6bae8237e1
TavisCI OSX add miniupnpc include and lib path 2019-11-28 16:01:47 +01:00
Gioacchino Mazzurco
722b1dbffc
Attempt to fix AppveyorCI
+ Cleanup macosx variables
2019-11-28 14:28:27 +01:00
Gioacchino Mazzurco
3bb42ca799
Fix wrong rapidjson include on Appveyor 2019-11-28 01:38:49 +01:00
Gioacchino Mazzurco
c73bdb83cd
Drop libresapi and modules that depends on it
A copy of the repository freezed before this deletion to ease old code
  viewing is available at
  https://github.com/RetroShare/zz_archive_RetroShare_libresapi
Removed some more cruft
Temporarly disabled JSON API generation of RsWebUi methods due to
  compilation breakage when rs_webui is disabled, RsWebUi keeps working
  but cannot be restarted from JSON API
2019-11-27 23:32:38 +01:00
csoler
9a24af87a4
Moved #ifdef RS_WEBUI inside RS_JSONAPI ifdefs so that the webui files cannot be requested unless jsonapi files are compiled 2019-11-27 21:14:20 +01:00
csoler
50529654f8
fixed compilation: both rs_jsonapi and rs_webui are needed to compile p3webui.h/cc 2019-11-27 20:24:56 +01:00
Gioacchino Mazzurco
1d4ca64dee
Prepare for merging 2019-11-27 18:44:10 +01:00
csoler
b1860d8682
fixed two warnings 2019-11-26 18:52:39 +01:00
csoler
3af234f4b0
added missing file 2019-11-26 14:00:20 +01:00
csoler
7aa51423a4
fixes required by review of pr1700 2019-11-25 22:16:32 +01:00
csoler
4a257614f1
merged with upstream/master 2019-11-24 18:38:50 +01:00
csoler
ef76b571c8
added missing restart 2019-11-24 11:04:26 +01:00
csoler
c7af86b4c1
using static resources for webui 2019-11-24 10:50:58 +01:00
csoler
c2d47b01df
added extra check when restarting rb service 2019-11-24 09:40:35 +01:00
csoler
52b0729b31
added missing pushback in resources 2019-11-23 21:51:56 +01:00
csoler
131d73cd11
added resources for local fonts in webui 2019-11-23 21:46:18 +01:00
csoler
d1a9f839a4
fixed restart of webui 2019-11-23 18:40:31 +01:00
csoler
b8b7d103e1
fixed compilation by modifying wrappers to account for the shared_ptr mService 2019-11-23 15:11:22 +01:00
csoler
009ed54ce2
changed layout of restbed/json/webui so that JsonApi is the only server (with thread functionality in a separate class) and webui is a resource provider 2019-11-23 00:17:17 +01:00
G10h4ck
f5bf093409
Merge pull request #1696 from G10h4ck/modern_cpp
Take advantage of modern C++ features
2019-11-21 17:46:53 +01:00
csoler
997501a24d
fixed retroshare_service with embedded webui 2019-11-17 22:01:49 +01:00
csoler
0fdbcf6b57
added dbg info 2019-11-16 23:37:23 +01:00
csoler
9491f1a78e
fixed interactions between webui and jsonapi in GUI 2019-11-16 18:19:07 +01:00
csoler
6878a7773d
fixed start/stop of jsonapi in GUI 2019-11-16 14:30:36 +01:00
csoler
a304ec20ef
converted JsonAPI with public api and using RestbedService system 2019-11-16 00:02:02 +01:00
csoler
3ca22f0052
created separate class for restbed services 2019-11-14 22:02:42 +01:00
csoler
a584b822a8
fixed typo 2019-11-13 21:54:11 +01:00
csoler
1b8f137dee
improved UI for jsonapi and webui pages 2019-11-13 21:35:57 +01:00
csoler
9007d266a8
fixed start/stop of webinterface from GUI 2019-11-13 21:06:20 +01:00
csoler
d19d1685de
made JsonApiServer an singleton through static method instance() 2019-11-12 22:32:18 +01:00
Gioacchino Mazzurco
ca6071fa21
fixup! Improve RsUrl 2019-11-11 23:49:06 +01:00
csoler
3b45fc5199
added user-based token management to jsonApiServer 2019-11-11 22:48:35 +01:00
Gioacchino Mazzurco
056904c90b
Improve RsUrl
Fix a bug in RsUrl::fromString eating one character when parsing URL
  string with IPv6 host
Offer explicit conversion from sockaddr_storage
2019-11-11 11:17:13 +01:00
csoler
93376d3461
added (not yet working) password field 2019-11-10 22:39:21 +01:00
csoler
9dc78d66c1
fixed changing ports and restarting 2019-11-10 22:05:55 +01:00
csoler
3446f0b677
fixed a few bugs. First running version. 2019-11-10 21:29:26 +01:00
csoler
0103a741d6
updated default directory value 2019-11-10 17:56:04 +01:00
csoler
6603dbd913
code to embed webUI server in the main executable (initial version, not yet working) 2019-11-10 17:38:16 +01:00
Gioacchino Mazzurco
7697a57611
Backport rs_unique_cast from grouter_missing_key branch 2019-11-07 19:54:11 +01:00
Gioacchino Mazzurco
bee9dfc19e
Implement comfortable flags type based on scoped enums 2019-11-07 19:51:25 +01:00
Gioacchino Mazzurco
05260ace94
Backport as_const C++17 helper
This is expecially useful to use const_iterator without giving up on
  using auto keyword
2019-11-07 19:51:25 +01:00
Gioacchino Mazzurco
aabba04be9
Remove some cruft from p3peermgr 2019-11-07 19:47:23 +01:00
Gioacchino Mazzurco
a259307218
Deprecate GxsTransSubServices in favor of RsServiceType 2019-11-06 17:16:41 +01:00
csoler
36441c16dc
Merge pull request #1694 from csoler/v0.6-ImprovedGUI
added notification when distant chat has undelivered messages. Update…
2019-11-03 20:50:19 +01:00
Gioacchino Mazzurco
48879d1f40
Remove some cruft 2019-10-31 11:29:16 +01:00
csoler
ea9f88a32f
added notification when distant chat has undelivered messages. Updated the text to remove technical terms such as tunnels 2019-10-26 22:57:13 +02:00