Commit Graph

683 Commits

Author SHA1 Message Date
G10h4ck
f09bef2ac8
Merge pull request #1349 from G10h4ck/jsonapi
Implement JSON API HTTP Basic authentication
2018-09-25 18:10:16 +02:00
Gioacchino Mazzurco
ccabf82e60
retroshare-gui now handle JsonApiServer too 2018-09-21 19:01:32 +02:00
csoler
9a09e209ea
added context menu entry to only show current IPs instead of all known IPs 2018-09-18 22:02:18 +02:00
Gioacchino Mazzurco
7787f9d62f
Merge branch 'master' into jsonapi 2018-09-05 00:17:21 +02:00
Gioacchino Mazzurco
a194e4cf56
Make JSON API server bind address configurable
Enforce it being 127.0.0.1 by default, I assumed 127.0.0.1 was restbed
default, but as reported by sehraf is not alwayd the case

JSON API bind address now is also configurable via commandline on
retroshare-android-service and retroshare-nogui, while it obey the
configuration of webui (execept for that port is incremented by 2)
in retroshare-gui
2018-09-05 00:08:56 +02:00
csoler
c9b30f5a72
fixed merged with upstream/master 2018-08-28 23:42:24 +02:00
csoler
c294971633
Merge pull request #1289 from G10h4ck/jsonapi
Implement automatic JSON API generation
2018-08-28 19:11:08 +02:00
Gioacchino Mazzurco
f5d306c7b1
Made JSON API port configurable from retroshare-gui
Use port used by webui + 2
2018-08-25 18:39:32 +02:00
sehraf
fe22465869
fix proxy indicators not being updated 2018-08-25 17:53:30 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
csoler
af7556610a
added option whether to trust friend nodes for banned files 2018-08-19 15:52:35 +02:00
Phenom
c00efe93d4 Add RsCollection's content automatically download option. 2018-07-31 17:02:03 +02:00
csoler
62b9a74324
fixed running with TorControl in new mode 2018-07-25 15:31:18 +02:00
csoler
d1a375cbd0
removed RETROTOR #ifdef and started using RsAccounts::isTorAuto() instead. Unfinished yet. 2018-07-25 11:37:40 +02:00
Gioacchino Mazzurco
130007b578
Merge branch 'master' into jsonapi 2018-07-23 13:44:01 +02:00
chelovechishko
b3dddeafdf add missing namespaces 2018-07-06 23:55:12 +09:00
Gioacchino Mazzurco
7ad337c8d2
Implement automatic JSON API generation
qmake file add jsonapi-generator target to compile JSON API generator
qmake files add rs_jsonapi CONFIG option to enable/disable JSON API at compile
  time
RsTypeSerializer pass down same serialization flags when creating new context
  for nested objects serial job
RsGxsChannels expose a few methods through JSON API as example
Derive a few GXS types (RsGxsChannelGroup, RsGxsChannelPost, RsGxsFile,
  RsMsgMetaData) from RsSerializables so they can be used for the JSON API
Create RsGenericSerializer::SERIALIZATION_FLAG_YIELDING so JSON objects that
  miss some fields can be still deserialized, this improve API usability
SerializeContext offer friendly constructor with default paramethers
Add restbed 4.6 library as git submodule as most systems doesn't have it yet
Add a bit of documentation about JSON API into jsonapi-generator/README.adoc
Add JsonApiServer class to expose the JSON API via HTTP protocol
2018-06-24 16:28:33 +02:00
Gioacchino Mazzurco
1f76108a9e
Remove some cruft from build files 2018-06-11 14:21:28 +02:00
Gioacchino Mazzurco
1ad1fdc7be
p3NetMgrIMPL::checkNetAddress() notify if port change
Plus cleanups and proper sockaddr_storage copy
2018-05-22 19:17:37 +02:00
Phenom
f12cd5774d Fix Partial Dir Check
Add WrongValue StyleSheet property, when bad directory selected.
Update QLineEdit with current setting so it's possible to see if
something is modified. No need to restart.
2018-05-12 14:31:28 +02:00
csoler
680346c155
Merge pull request #1239 from RetroPooh/discosw2
fix discovery switch
2018-04-26 22:06:01 +02:00
RetroPooh
1d5e029a25 fix discovery switch 2018-04-26 23:01:58 +03:00
G10h4ck
82eb42ad8a
Merge pull request #1235 from G10h4ck/build_improvements
Build improvements
2018-04-23 12:04:35 +02:00
Gioacchino Mazzurco
4876a0ea3b
Multiple improvements to build process
Restructure and document retroshare.pri variables and helper functions
Link sqlite statically like other libraries on Android
qmake has multiple win32-* specs match them correctly
Move a buch of generic thing to retroshare.pri instead of having them replocated
  accross project specific .pro
Fix retroshare-gui too many symbols exported on windows liking error by adding
  QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
Rename retroshare-gui/src/util/win32.h because the name is too prone to
  confusion and build conflicts
libreasapi avoid usage of cretar_prl link_prl that seems unreliable on some
  platforms
libreasapi rename LIBRESAPI_QT to more understendable LIBRESAPI_SETTINGS
Use use_*.pri instead of copy pasting error prone qmake snippets around
Expose bitdht option to retroshare.pri
Add RS_THREAD_LIB qmake variable for better crossplatform support
Move debug and profiling generic options to retroshare.pri (avoid copy/pasting)
Remove Qt script module in qmake as it is not available anymore
2018-04-18 07:56:43 +02:00
Gioacchino Mazzurco
b36cb1ef17
Fix retroshare GUI building with no_libresapihttpserver 2018-04-15 12:41:54 +02:00
RetroPooh
e17edbfa1f fix default tab on serverpage 2018-04-01 14:13:42 +03:00
RetroPooh
6964ba4165 fix tab index on serverpage 2018-04-01 14:13:21 +03:00
Phenom
4e6f2ae702 Fix Icon for About page. 2018-03-04 14:31:16 +01:00
csoler
72124bbd3f
hide advanced mode option since it is not used anywhere in the software 2018-02-14 22:08:07 +01:00
csoler
c1fccef53b added comment about tab numbers 2018-01-20 19:23:08 +01:00
csoler
19f1a645f8 fixed update of Tor status in settings 2018-01-19 13:42:31 +01:00
csoler
e28886fe79 updated to upstream/master 2018-01-05 21:59:22 +01:00
csoler
fcc3995d87 removed BanList service from Retro-Tor version 2018-01-01 15:49:49 +01:00
csoler
a591001cec improved Tor startup phase integration in TorControlDialog 2017-12-28 21:39:35 +01:00
csoler
5b5a2bef81 split tor control into two parts 2017-12-21 18:16:32 +01:00
RetroPooh
a88c2efab1 fix freezes in network settings 2017-11-29 17:17:49 +03:00
Phenom
589e61ff67 Fix CppCheck in rsettings.cpp
/retroshare-gui/src/gui/settings/rsettings.cpp:43: warning:
Cppcheck(passedByValue): Function parameter 'fileName' should be passed
by reference.
2017-11-06 22:20:44 +01:00
RetroPooh
f8fca19e1b removed wrong tooltip for hidden node in options 2017-10-25 23:07:34 +03:00
RetroPooh
5296641f29 fix saving of forum options checkbox for load images 2017-10-25 20:50:34 +03:00
csoler
e441caec49 Merge pull request #1074 from RetroPooh/sett-nodiscocb
removed show discovery checkbox from network options, it is in appear…
2017-10-23 21:11:08 +02:00
RetroPooh
4a1ddccd8e removed show discovery checkbox from network options, it is in appearance now 2017-10-23 12:24:56 +03:00
Pooh
1cc65066dd Update ServerPage.cpp 2017-10-23 11:49:05 +03:00
RetroPooh
78037a66be disable nat/dht indicators for hidden mode, hide irrelevant network options elements 2017-10-23 11:42:03 +03:00
csoler
22942dc70b fixed bug causing suffix/prefix lists to contain an empty string 2017-10-01 20:20:26 +02:00
felisucoibi
06063c525e removed extra space 2017-09-30 11:34:18 +02:00
felisucoibi
b84c8983c4 Removed ... from text 2017-09-30 00:29:07 +02:00
felisucoibi
ef6fd38696 Changed prefixes and sifixes for startign with and ending with to be understandable.
On internet software uses starting with and ending with instead of prefixes and sufixes, in literature is ok even in internet sometimes, but when you search for files or filter files you use the filter starting with and ending with, is not prefixes is wrong but less understandable in internet language talking about files.
2017-09-28 22:42:30 +02:00
csoler
0d9b6e7c8c fixd broken layout 2017-09-25 22:09:35 +02:00
csoler
4766a8927a added an additional hard limit to directory depth, just in case 2017-09-24 23:51:47 +02:00
csoler
2a99df4d48 added UI and parameters for two new options in shared files: max share depth and ignore duplicates 2017-09-24 17:53:06 +02:00
csoler
5511a0b2b0 added tooltip for file ignore list 2017-09-14 21:28:34 +02:00
csoler
551ef63c6e added default ignore list on linux 2017-09-11 19:36:06 +02:00
csoler
ea25d4b5a4 improved update of ignore list 2017-09-10 20:22:17 +02:00
csoler
884b3a6220 added infrastructure to add a ignore list in shared files 2017-09-10 19:58:57 +02:00
Phenom
55bb105462 Fix Relay Setting Layout Margin 2017-08-12 11:21:14 +02:00
Phenom
c2a3e46700 Fix WebUI Setting Saving. 2017-07-30 18:29:03 +02:00
Phenom
145ce6b8b5 Fix CppCheck Error in ChatPage.cpp
/retroshare-gui/src/gui/settings/ChatPage.cpp:398: error:
Cppcheck(syntaxError): syntax error
2017-07-21 15:11:55 +02:00
Phenom
5bf056c7a4 Rename retroshare06 to retroshare 2017-07-17 10:45:18 +02:00
Phenom
82addce867 Change RetroShareLink creation methodes as static
And remove this warning:
2017-07-16 13:12:07 +02:00
csoler
5f7df7cb73 update call to notifySettingsChanged() when changing the thread loading of channels 2017-07-04 23:26:57 +02:00
csoler
931ddaef79 set load thread to false for channels on default. Fixed missing () in connect 2017-07-04 23:13:03 +02:00
Phenom
b4071d158e Add General Direct Download setting.
Yes, No, Per User
2017-06-29 17:18:28 +02:00
csoler
b96effb2d2 Merge pull request #895 from PhenomRetroShare/Add_HelpInRelayTab
Add help in Relay setting tab.
2017-06-28 22:37:50 +02:00
sehraf
3c54bebc31 hide hidden service port for I2P instead of just disabling it (it's not used for I2P) 2017-06-25 19:19:07 +02:00
Phenom
c415e11fa2 Add help in Relay setting tab. 2017-06-22 18:59:05 +02:00
Phenom
ea8af8acb3 Move Relay setting page to network one. 2017-06-21 18:38:52 +02:00
csoler
43dcddce67 Merge pull request #880 from PhenomRetroShare/Add_GxsCircleNotify
Add Circle Feed Item.
2017-06-16 12:37:09 +02:00
sehraf
65ab68b4f7 fix stop button being wrongly disabled 2017-06-15 07:22:33 +02:00
Phenom
aa64c4d3c5 Add Circle Feed Item. 2017-06-11 16:16:41 +02:00
sehraf
541b42a01a minor fix 2017-05-26 20:29:43 +02:00
sehraf
a3ee85a30d Add I2P BOB support to libretroashare and RetroShare GUI 2017-05-24 19:40:01 +02:00
Phenom
7acefda943 Fix Chat Font setting saving.
And don't use native dialog.
2017-05-19 18:40:17 +02:00
csoler
caa36b4623 Merge pull request #807 from PhenomRetroShare/Fix_ToasterPositionSetting
Fix Toaster Position Setting.
2017-05-08 22:17:09 +02:00
csoler
8a86b9ed7d added a per-friend upload slots limit in FT. Default is 0=unlimited 2017-05-08 22:00:51 +02:00
Phenom
594ab53ef2 Fix Toaster Position Setting. 2017-05-08 15:37:33 +02:00
csoler
84c81588bb disabled show OpMode status on default 2017-05-08 09:39:18 +02:00
Phenom
9e246c9670 Add warning about relays bandwidth. 2017-04-25 18:39:36 +02:00
Phenom
1327582096 Fix Relay setting values
Was multiply by 1024 then divide by 1000.
2017-04-24 17:28:25 +02:00
Phenom
4c326f5e80 Fix Relay setting page. 2017-04-23 10:27:18 +02:00
csoler
21143742fd fixed update of Tor proxy address in hidden nodes server page 2017-03-15 19:26:07 +01:00
mestaritonttu
999e845bdf Fix grammar 2017-03-08 13:17:34 +02:00
csoler
283a2ee5fe Merge pull request #717 from PhenomRetroShare/Fix_SettingListWidth
Fix Setting list width.
2017-03-07 21:54:56 +01:00
csoler
ed22b48db9 Merge pull request #738 from mestaritonttu/patch-20
Various improvements and fixes to strings
2017-03-07 21:51:51 +01:00
csoler
376be42950 Merge pull request #739 from mestaritonttu/patch-21
Improvements and typo fixes in strings
2017-03-07 21:51:13 +01:00
mestaritonttu
87f9dba211 Improvements and typo fixes in strings 2017-03-07 14:05:21 +02:00
mestaritonttu
222cf48c8f Various improvements and fixes to strings 2017-03-07 14:03:05 +02:00
mestaritonttu
ba18fcdc27 Fix grammar 2017-03-07 13:45:31 +02:00
csoler
a5182252af Merge pull request #716 from felisucoibi/master
Renamed settings name sections now they are the same as buttons
2017-03-07 11:27:17 +01:00
Phenom
dc65d3fe0a Fix Setting list width. 2017-03-06 21:19:41 +01:00
csoler
fbd72ddf73 fixed settings SoundPage 2017-03-05 13:57:49 +01:00
felisucoibi
15bb0ff416 Update ChatPage.h 2017-03-05 02:45:37 +01:00
felisucoibi
951820f1d1 Update ForumPage.h 2017-03-05 02:45:07 +01:00
felisucoibi
63174aa14e Update PostedPage.h 2017-03-05 02:44:18 +01:00
felisucoibi
ca75515541 Update MessagePage.h 2017-03-05 02:43:40 +01:00
csoler
931442a0c2 fixed compilation 2017-03-04 00:07:51 +01:00
csoler
b4e0a8f836 removed unused file DirectoriesPage.{cpp,ui,h} 2017-03-04 00:04:52 +01:00
csoler
e25756316d merged Directories settings page into Transfers and renamed it Files 2017-03-04 00:01:21 +01:00
csoler
556aae6ce7 Merge pull request #711 from RetroPooh/test2
homepage: add webhelp and move quickstartwizard from settings general
2017-03-03 22:37:16 +01:00
Phenom
1584b7773e Fix NAT Display setting saving. 2017-03-03 20:35:18 +01:00
felisucoibi
c7115da408 CHANGED ORDER IN SETTINGS
To be in same order than the buttons in menu.
2017-03-03 14:23:50 +01:00