csoler
|
5223ff751a
|
removed .gitignore
|
2019-11-24 18:39:36 +01:00 |
|
csoler
|
4a257614f1
|
merged with upstream/master
|
2019-11-24 18:38:50 +01:00 |
|
csoler
|
b842936ae7
|
removed webUI shutdown when quiting because it duplicates jsonapi shutdown.
|
2019-11-24 15:47:41 +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
|
45be028b12
|
Merge pull request #1714 from rex4539/force-light-mode
Force light mode on macOS
|
2019-11-23 09:57:23 +01:00 |
|
csoler
|
583f9db3b5
|
Merge pull request #1707 from defnax/added-message-length-check-for-Channels
Added message length check for channels
|
2019-11-23 09:56:22 +01:00 |
|
csoler
|
25ae64a906
|
Merge pull request #1711 from defnax/updated-tray-menu-icons
Updated tray menu icons
|
2019-11-23 09:54:35 +01:00 |
|
Dimitris Apostolou
|
5454be9241
|
Force light mode on macOS
|
2019-11-23 08:49:11 +02:00 |
|
defnax
|
612c21f4b0
|
restore gitignore
|
2019-11-23 00:28:28 +01:00 |
|
defnax
|
cdc12c03a4
|
Remove fixed size issues with the invite/leave buttons on dark stylesheets
Removed fixed size issues with the invite/leave buttons on dark stylesheets
Added new context menu icons for Enter & join Chat rooms
|
2019-11-23 00:25:52 +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 |
|
defnax
|
c22524d5d1
|
updated tray menu icons
|
2019-11-22 13:58:25 +01:00 |
|
defnax
|
c3fe35fa41
|
Merge pull request #30 from RetroShare/master
update to master
|
2019-11-22 13:37:06 +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 |
|
defnax
|
7e484d57a7
|
Merge pull request #29 from RetroShare/master
update to master
|
2019-11-20 22:34:34 +01:00 |
|
csoler
|
b6f61d113c
|
Merge pull request #1710 from defnax/Fixing-Setting-BUtton-on-Chat-Widget
Fixing settings button on chat widget for darkstyle sheets
|
2019-11-20 22:17:21 +01:00 |
|
defnax
|
bbee5690a8
|
Fixed Settings Button on the Chat Widget for the darkstyles
|
2019-11-20 22:07:44 +01:00 |
|
defnax
|
f2346531c7
|
Merge pull request #28 from RetroShare/master
update to master
|
2019-11-19 22:24:01 +01:00 |
|
csoler
|
09ba897c60
|
Merge pull request #1686 from defnax/changes-for-connect-friend-wizard
Changes for connect friend wizard
|
2019-11-18 20:39:42 +01:00 |
|
defnax
|
836a872fd6
|
Added for Channel Messages to checkt the length
|
2019-11-18 18:52:27 +01:00 |
|
defnax
|
7cb4afee84
|
Merge pull request #27 from RetroShare/master
update to lastest master
|
2019-11-18 17:03:50 +01:00 |
|
csoler
|
997501a24d
|
fixed retroshare_service with embedded webui
|
2019-11-17 22:01:49 +01:00 |
|
csoler
|
2123ad7645
|
enable terminal login and webui passwd except on android
|
2019-11-17 13:23:08 +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 |
|
G10h4ck
|
454ed9c28e
|
Merge pull request #1701 from rex4539/catalina-support
Support for macOS 10.15 Catalina
|
2019-11-12 09:48:47 +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 |
|
Dimitris Apostolou
|
229c2206a4
|
Support for macOS 10.15 Catalina
|
2019-11-11 21:06:30 +02: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 |
|