Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-12 17:34:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,755 Commits 63 Branches 22 Tags 195 MiB
3a6648f706
Commit Graph

6032 Commits

Author SHA1 Message Date
csoler
cd98f02246
removed askForDeferredSelfSignature() and made IdEditDialog comply with this 2020-04-02 22:24:14 +02:00
csoler
0cc871da60
removed TokenQueue from IdEditDialog PGP Signed identities still not working 2020-04-01 22:34:47 +02:00
csoler
cf7a77e512
finished converting GxsMessageFrameWidget to blocking API 2020-03-31 20:21:16 +02:00
drbob
3402aa861f Merge branch 'master' into thewire_fix_message_display 2020-03-31 21:23:51 +11:00
csoler
55c810f848
first pass for converting GxsMessageFrameWidget to blocking API 2020-03-29 23:21:48 +02:00
csoler
c18dfb39c3
added some more debug info and proper error output to GxsDb 2020-03-26 23:19:34 +01:00
csoler
5dcbb978c3
improvement of autoloading of GxsGroupFrameDialog 2020-03-26 16:47:37 +01:00
csoler
6616e8a6b3
fixed priority problem in async request of group data tht shows up in RsGxsForumThreadWidget 2020-03-22 23:35:34 +01:00
csoler
0f5fd198a4
removed debug info in db access 2020-03-22 22:06:49 +01:00
csoler
6c1f09a53b
completely removed TokenQueue from GxsGroupDialog and GxsGroupFrameDialog 2020-03-22 21:47:14 +01:00
csoler
b8ec91aac5
fixed missing returns 2020-03-21 15:46:52 +01:00
csoler
2387150f64
1/4 convertion of GxsGroupFrameDialog to blocking API 2020-03-21 15:25:34 +01:00
csoler
1a9ac16546
fixed bug due to missing iterator increment 2020-03-19 21:20:52 +01:00
csoler
cd4594d0a3
merged with upstream/master 2020-03-19 09:15:45 +01:00
csoler
b6667a2c5a
fixed bug causing RS to eat all the memory, slow down GxsId access and ultimately make forums and other Gxs services to not load properly 2020-03-18 22:33:58 +01:00
csoler
676ddfbfb5
removed waitToken from GxsTokenService since it was only used directly by rsGenExchange to export keys 2020-03-17 23:33:03 +01:00
csoler
5408427ea8
added auto delete active token feature to RsGxsIfaceHelper 2020-03-17 00:13:29 +01:00
csoler
db42c7a973
removed sleep in p3GxsTunnel::tick() since it is not needed and causes unwanted delays 2020-03-15 13:15:33 +01:00
sehraf
ddd6b91f71
i2pbob: fix deadlock on shutdown 2020-03-13 17:08:48 +01:00
csoler
4c4b7ce754
Merge pull request #1826 from csoler/v0.6-FT4 
attempt to solve GXS data access problems in new blocking API
 2020-03-13 14:37:53 +01:00
drbob
fc53af2646 TheWire fixup up display of messages 
Process messages to group replies correctly and sort by age.
Expand message display to include replies.
Add coloring to distinguish between replies and actual msgs.
Enable subscribe / unsubscribe buttons.
Add Selection of which set of groups are visible.
Add missing setNetworkExchangeService calls for photo + wire services.
 2020-03-13 16:44:15 +11:00
csoler
230eca985f
reverted unnecessary cancel of tokens after waitToken in p3gxscircles 2020-03-11 22:42:34 +01:00
csoler
a02bb0acb6
added cancel in waitToken in rstokenservice 2020-03-11 22:41:57 +01:00
csoler
dc3c3488df
added blocking API for createComment() in GxsCommentService and removed token queue from GxsCreateCommentDialog 2020-03-09 21:01:55 +01:00
csoler
4031b081c5
Merge pull request #1824 from drbob/photos_improve_sharing 
Updates to PhotoSharing service
 2020-03-08 23:14:38 +01:00
Gioacchino Mazzurco
57be2cb11e
Silence excessive debugging in miniupnp handler 2020-03-08 22:07:12 +01:00
csoler
ab2c1f23e9
attempt to solve GXS data access problems in new blocking API 2020-03-07 20:39:10 +01:00
csoler
1f0678075f
merged upstream/master 2020-03-06 22:12:06 +01:00
Gioacchino Mazzurco
b62b3ec54b
Fix crash on Android due to dangling reference 
JSON API debug lambda returned a dangling reference on Android, fix by
  moving the scope of the returned object
What made this a bit tricky to understand was the fact that it happened
only on Android, while the code was formally incorrect for all
platforms, and strangely caused a stack overflow due to two std lib
functions (sentry and flush) calling each other ad infinitum

+#23379 0x603cb2a8 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::flush (this=0x618e92bc) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:949
+#23380 0x603cad08 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::sentry::sentry (this=0x618e9284, __os=...) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:270
+#23381 0x603cb2a8 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::flush (this=0x618e92bc) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:949
+#23382 0x603cad08 in std::__ndk1::basic_ostream<char, std::__ndk1::char_traits<char> >::sentry::sentry (this=0x618e9304, __os=...) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:270
+#23383 0x603caa6c in std::__ndk1::__put_character_sequence<char, std::__ndk1::char_traits<char> > (__os=..., __str=0x61379a60 " user: ", __len=7) at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:726
+#23384 0x603caa30 in std::__ndk1::operator<< <std::__ndk1::char_traits<char> > (__os=..., __str=0x61379a60 " user: ") at /opt/android-ndk/sources/cxx-stl/llvm-libc++/include/ostream:869
+#23385 0x60522184 in t_RsLogger<(RsLoggerCategories)5>::operator<< <char [8]> (this=0x618e92bc, val=...) at ../../../../Development/rs-develop/libretroshare/src/util/rsdebug.h:53
+#23386 0x60bbe5ec in JsonApiServer::registerHandler(std::__ndk1::basic_string<char, std::__ndk1::char_traits<char>, std::__ndk1::allocator<char> > const&, std::__ndk1::function<void (std::__ndk1::shared_ptr<restbed::Session>)> const&, bool)::$_259::operator()(std::__ndk1::shared_ptr<restbed::Session>, std::__ndk1::function<void (std::__ndk1::shared_ptr<restbed::Session>)> const&) const (this=0x617d8364, session=..., callback=...) at ../../../../Development/rs-develop/libretroshare/src/jsonapi/jsonapi.cpp:517
 2020-03-06 18:21:32 +01:00
drbob
88f76c5fbb Update the data in photoitems 
Update PhotoItem members
 - remove excessive fields in Photo
 - add RsGxsFile to Photo
 - update ShareMode for Album
 - renamed photo.mThumbnail to mLowResImage
Update Photo GUI
 - enable setting of AlbumExtra parameters.
 - added data for Ordering of photos
 - stop showing duplicates in PhotoSlideShow
 2020-03-07 00:13:25 +11:00
csoler
3bd23d612a
Merge pull request #1817 from G10h4ck/optional_dh_init_test 
Add option to disable DH init check for faster init
 2020-03-06 11:16:45 +01:00
csoler
f59193b625
fixed bug in SQL access where timeout was compared to a negative value 2020-03-05 20:51:02 +01:00
csoler
09fe628415
removed debug info 2020-03-05 20:50:25 +01:00
csoler
ae932b605a
fixed 2 bugs causing forums and channels to be notified when already known and added notification list for posted 2020-03-04 19:17:09 +01:00
Gioacchino Mazzurco
15c3e87bc5
Add option to disable DH init check for faster init 
The check is not necessary and on Android it takes around 1 minute to
  complete.
 2020-03-03 16:21:14 +01:00
csoler
97e7df82c5
Merge pull request #1816 from csoler/v0.6-FT4 
TokenQueue cleanup
 2020-03-01 17:29:44 +01:00
csoler
76596e678e
Merge pull request #1815 from drbob/thewire-get-basics-working 
Get the basics of TheWire service working
 2020-03-01 16:40:35 +01:00
csoler
f8d07a3e92
switched to more reasonnable timeout values in waitToken 2020-03-01 13:45:07 +01:00
csoler
c09e9c407b
removed warning about filtered packet 2020-02-29 23:06:43 +01:00
csoler
4124585b55
removed unused print methods in some RsItems since now print is handled by serializer 2020-02-29 12:14:37 +01:00
Gioacchino Mazzurco
6bb0950dd6
Fix typo in documentation 2020-02-29 11:05:22 +01:00
drbob
24fd4ae3e7 Get the basics of TheWire service working 
Added REF fields to Wire Msgs to allow replys to work well.
Added description of how the Message fields should be used.
Added WireGroupDialog for creation of WireGroups.
Updated PulseAddDialog to support publishing Pulses and Replies.
Added classes to display Pulses / Groups.
Added single selection point of WireGroup for publishing.
Added basic "refresh" to reload new GXS data.
 2020-02-29 11:47:00 +11:00
drbob
5d0e2bb71e Add Album Editing (add / remove photos) 
Significant improvements to AlbumDialog
 - load Existing Photos to the Album
 - drag and drop add new Photos
 - mark photos for deletion
 - publish these changes
 - color photoitems depending on state

Fixed up Top-Level Photo display.
 - only show latest version of photo (hide deleted)
 - fixup grouping by "Own / Subscribed / Other" Albums
 - added Album detail editing using GxsGroupDialog
 2020-02-25 00:11:51 +11:00
csoler
737b846e23
Merge branch 'master' into v0.6-FT4 2020-02-22 21:11:00 +01:00
csoler
a89f572edf
Merge pull request #1796 from drbob/photos_switch_to_gxscomments 
Switch PhotoService to use GxsComments
 2020-02-22 17:09:09 +01:00
csoler
5645d71699
fixed connexion between posted items and async API, and removed dead code and debug info 2020-02-19 21:52:55 +01:00
csoler
167380127b
merged upstream/master 2020-02-17 19:54:16 +01:00
G10h4ck
dff0138376
Merge pull request #1795 from G10h4ck/posted_api 
Initial work on posted API
 2020-02-17 14:24:45 +01:00
drbob
fe62dc1345 Switch PhotoService to use GxsComments 
WIP improvements to PhotoService:
 - switch p3photoservice to use gxcommentservice
 - clean out old RsPhotoComment classes
 - redesign PhotoDialog to use standard GxsCommentService classes
 - remove unneeded old Comment classes from GUI
 - fix indenting for PhotoDialog and p3photoservice.h
 - fix layout issue in Extra Widgets for GxsGroupDialog
 2020-02-16 15:21:20 +11:00
csoler
01b39bfe63
Merge pull request #1782 from sehraf/pr_improve_udpStunner 
Reenable UDP stunner and add documentation
 2020-02-15 22:15:36 +01:00
sehraf
f019a71472
only use external up from DHT stunner as fallback when no other source provides a valid IP 2020-02-15 17:51:22 +01:00
csoler
93ee9bdd18
Merge pull request #1793 from drbob/fix_photo_group_creation 
Update RsPhotoItems and switch Photos to use GxsGroupDialog
 2020-02-15 14:39:55 +01:00
drbob
095b5224d9 fixup licence formatting 2020-02-15 11:54:29 +11:00
drbob
1baa92f60c fixup serialisation and indentation 2020-02-15 11:39:29 +11:00
Gioacchino Mazzurco
5604f7082b
Initial work on posted API 2020-02-14 23:30:52 +01:00
Gioacchino Mazzurco
c9728cead0
Fix typo in channels deprecated method notice 2020-02-14 23:30:10 +01:00
drbob
d04518fd55 Update RsPhotoItems and switch to GxsGroupDialog. 
WIP improvements to PhotoService:
 - Switch from custom image to use RsGxsImage
 - Update classes for new Image class
 - fix serialiser for photos
 - switch group creation to use GxGroupDialog
 - tweak GxsGroupDialog to display extra Widgets
 - add AlbumExtra widget
 2020-02-15 01:01:19 +11:00
csoler
a498d4e370
merged upstream/master 2020-02-11 22:16:31 +01:00
csoler
4c54d9d633
added missing case for IDs events 2020-02-11 22:14:29 +01:00
csoler
f75d0add47
added notification for circle cache updates to avoid the need for an additional UI timer 2020-02-11 16:37:53 +01:00
csoler
e4f243694b
finished removing token queue from IdDialog.cpp 2020-02-11 08:36:35 +01:00
csoler
1a250f5138
half-removed token queue system from IdDialog.cpp 2020-02-10 22:33:21 +01:00
csoler
07527cfead
fixed notifications in identity 2020-02-10 20:39:52 +01:00
drbob
d748278637 update code to get Wiki / Wire and PhotoShare compiling again 2020-02-10 22:24:47 +11:00
csoler
41a81fa5d1
fixed notifications in posted 2020-02-09 20:54:11 +01:00
sehraf
f27022fe7b
review fixup 2020-02-09 20:31:18 +01:00
sehraf
6e3740f3b8
add more documentation to updstunner.h 2020-02-09 20:31:17 +01:00
sehraf
6f9d875fc6
* unify CONFIG option for DHT stunner 
* implement optional (turned off by default) usage of dht stunner to determin external ip (this can be usefull for some corner case setups)
 2020-02-09 20:31:17 +01:00
sehraf
e91d877af2
udpstunner: don't open code header fields, reference and follow (old) RFC 2020-02-09 20:31:17 +01:00
sehraf
4095d82a67
add some documentation to updstunner.h 2020-02-09 20:31:17 +01:00
sehraf
1874241ddd
first pass on udpstunner.cc 2020-02-09 20:31:17 +01:00
sehraf
a7500473eb
enable DHT stunner 2020-02-09 20:31:13 +01:00
csoler
62c5cda7f0
merged upstream/master 2020-02-08 20:04:27 +01:00
csoler
a9f24c85a0
Merge pull request #1774 from G10h4ck/json_api_improvements 
JSON API improvements
 2020-02-07 23:16:04 +01:00
csoler
f72b385ccf
Merge pull request #1776 from csoler/v0.6-FT 
More switch to new notification system
 2020-02-07 23:15:41 +01:00
csoler
8e153b4acc
started removal of GxsBroadcastBase class 2020-02-06 19:57:23 +01:00
Gioacchino Mazzurco
039e8f653d
Solve race condition in JSON API restart 
Improve atomic access to restbed service
Protect JSON API restart against bursts
Fix JSON API error condition enum registration
Provide ostream helper for error_condition
Provide optional forced thread cancel for debugging purpose, disabled by
  default at compile time define RS_THREAD_FORCE_STOP to enable it
Avoid double fullstop in retroshare-gui json api apply button
 2020-02-05 18:56:47 +01:00
csoler
595df99310
fixed notifications for distant search results in channels 2020-02-03 21:39:05 +01:00
csoler
c6643613b6
Merge pull request #1753 from hunbernd/New-Posted-Card-View 
New posted card view enhancements
 2020-02-01 18:50:27 +01:00
Gioacchino Mazzurco
7757c685c5
Fixup token parsing 
If the token is like "somethingA:somethinchB:somethingC" then user is
"somethingA" and password is "somethinchB:somethingC"
 2020-02-01 16:40:26 +01:00
csoler
81c1eb227c
moved file hashing and download count to new notification system 2020-01-30 23:02:23 +01:00
Gioacchino Mazzurco
b0358759e5
Delete experimental deadcode 2020-01-30 18:11:49 +01:00
csoler
10bee9f26b
added optional delay to check files after download in order to prevent skiping recently downloaded files 2020-01-29 22:04:29 +01:00
csoler
0efc6b00a1
fixed missing check in AvatarInfo against empty image data 2020-01-29 21:02:46 +01:00
csoler
06be689bef
fixed missing cache update in GxsCircles 2020-01-28 22:53:43 +01:00
csoler
b6366ac5bd
fixed misplaced notification event in GxsCircles 2020-01-28 22:47:30 +01:00
csoler
841ba9e579
added some missing notifications in circles dialog 2020-01-28 22:22:04 +01:00
Gioacchino Mazzurco
8c9310f754
Fix global shutdown call from JSON API 2020-01-27 23:40:18 +01:00
csoler
424e7be52f
added notifications for identities 2020-01-27 23:02:04 +01:00
csoler
90bb6c0011
fixed notifications in forums, posted and channels 2020-01-27 21:38:57 +01:00
Gioacchino Mazzurco
5dbbe1ffd7
Improve debugabbility of JSON API 
JSON API server uses standardized error handling based on
  std::error_condition for a few method, this improve debugabbility both
  from library size and from API client side
JSON API auth token are now more flexible, now the only proibition is using
  colon character ':' in user name
Implemented TO_JSON operation for std::error_condition
Avoid unkown serial job handling code duplication via fatalUnknownSerialJob
Usability improvement in t_RsLogger
Disable compilation of now unused is_alphanumeric
 2020-01-27 21:22:49 +01:00
csoler
fb9282f588
moved UserNotify to MainPage level, and added RsEvent handling code in Posted 2020-01-26 23:19:20 +01:00
csoler
9c65836503
Merge pull request #1768 from csoler/v0.6-SSL111Fix 
fixed OpenSSL 1.1.1 bug on debian due to security level being set to …
 2020-01-24 23:08:06 +01:00
csoler
afdf917188
fixed OpenSSL 1.1.1 bug on debian due to security level being set to 2 on default 2020-01-23 23:31:24 +01:00
hunbernd
b3ac3d58a9 Merge upstream 2020-01-22 00:16:41 +01:00
Gioacchino Mazzurco
92990c55e7
JSON API spit out CORS headers also on error 
Browsers won't let JavaScript properly handle the error if the corsa
  headers are missing thanks Saud for report see:
  retroshare://forum?name=Shouldn%27t%20CORS%20headers%20be%20present%20for%20all%20API%20responses%3F&id=8fd22bd8f99754461e7ba1ca8a727995&msgid=e3232ae3a1b76698576a9159ba962fa5091e710c
 2020-01-21 12:56:52 +01:00
csoler
912f5de90b
Fixed UDP bug (Congrats to Sehraf for finding this!) 2020-01-19 20:08:58 +01:00
csoler
6136ac08f5
removed grouter debug output 2020-01-19 17:43:57 +01:00
csoler
3e62ce2e0a
fixing -u flag not being accounted for 2020-01-18 21:26:34 +01:00
csoler
1370d1417e
Merge pull request #1756 from csoler/v0.6-GRouter 
[WIP] V0.6 GRouter
 2020-01-18 13:55:29 +01:00
csoler
c75d372f24
merged upstream/master 2020-01-17 22:16:24 +01:00
csoler
26df59971f
Merge pull request #1748 from csoler/v0.6-ImprovedGUI_2 
V0.6 improved gui 2
 2020-01-17 22:14:49 +01:00
csoler
8941a19db9
fixed mistake that causes missing FeedItems for messages and posted 2020-01-17 21:22:39 +01:00
hunbernd
2b2a9f9a89 Merge upstream 2020-01-13 11:21:59 +01:00
csoler
f0921886db
fixed glitch in previous commit 2020-01-11 19:08:11 +01:00
csoler
6a4c98b2ed
allowed some clients to Event handler to register with type NONE, which means that all event types will be sent to the client 2020-01-11 19:01:43 +01:00
csoler
45e579c98f
fixed bug where notification was missing on creation of new post in forums, channels and posted 2020-01-11 17:00:01 +01:00
csoler
f76b81ba49
fixed compilation in jsonapi to cope with new event type field in registerEventHandler() 2020-01-11 16:10:28 +01:00
csoler
2bd5bb5a3e
fixed merge with master 2020-01-11 00:08:36 +01:00
Gioacchino Mazzurco
33c2f56a8e
Fixup jsonapi server stopping 2020-01-08 23:16:05 +01:00
Gioacchino Mazzurco
f12ec2b535
JSON API service and RsThread fixups 2020-01-08 14:24:46 +01:00
hunbernd
0e8b12ff9f Merge upstream 2020-01-07 15:05:21 +01:00
Gioacchino Mazzurco
014b5255ed
Fixup windows build 2020-01-07 02:00:57 +01:00
Gioacchino Mazzurco
8718a442d1
Merge branch 'master' of github.com:RetroShare/RetroShare 2020-01-07 01:50:44 +01:00
Gioacchino Mazzurco
880a328c91
Fixup nested include in rsinit.cc 2020-01-07 01:50:17 +01:00
Gioacchino Mazzurco
b17738f668
Merge branch 'csoler-v0.6-SecNotification' 2020-01-07 01:19:08 +01:00
Gioacchino Mazzurco
babd2938c2
Print libretroshare version on init 2020-01-07 01:18:29 +01:00
Gioacchino Mazzurco
37b5d8f307
Fix few glitches in Cyril PR 2020-01-07 00:54:49 +01:00
csoler
c1e23099a0
improved the logic of incoming item handling a little bit: only check service id for items that are for us, and store items with missing keys in waiting queue 2020-01-06 22:23:07 +01:00
Gioacchino Mazzurco
c96223a2a8
Merge "Switched security items to new notification system #1735" csoler-v0.6-SecNotification 2020-01-06 15:09:06 +01:00
Gioacchino Mazzurco
f4f7b8a1ea
Few fixes after rebase 2020-01-06 14:46:36 +01:00
csoler
b067b1402f
added queue for GRouter items that miss a signature key and auto-request of missing keys to friends when needed (simplified changes from PR~1697) 2020-01-04 20:39:43 +01:00
csoler
28ec7f5fb2
improved type definition for GRouter item flags (simplified changed from PR~1697) 2020-01-04 20:35:49 +01:00
csoler
e5d8600f25
Added the possibility to request identities to specific peers (simplified changelog from PR~1697) 2020-01-04 20:34:35 +01:00
csoler
b824bfc166
removed debug output in p3gossipdiscovery.cc 2020-01-01 18:01:53 +01:00
Gioacchino Mazzurco
df87fe53b1
Cleanup RsThread and related classes 
Removed antipattern abstraction RsSingleJobThread
Rename runloop() method to run() in RsThread
Ported few classes ineriting from RsSingleJobThread to RsThread
RsThread use std::atomic instead of self implemented strange binary semaphores
Removed RsTickingThread::shutdown() use RsThread::askForStop() instead
Removed RsTickingThread::fullstop() use RsThread::fullstop() instead
Stop properly JSON API server in retroshare-gui
Centralize errno traslation to literal in util/rserrno.*
 2019-12-30 10:38:54 +01:00
hunbernd
d49443caf3 Fixed bug preventing hashing files from file paths with special characters 2019-12-30 00:04:36 +01:00
csoler
c544b1da7c
changed RsEvents so that it takes event types when registering handlers, which limits the number of handlers called for each event 2019-12-29 13:50:54 +01:00
csoler
dc2f2f5eb4
fixed ambiguous variable 2019-12-29 13:49:56 +01:00
csoler
a469647386
replaced RsErr() by RsInfo() in pqissl when applicable 2019-12-25 19:24:52 +01:00
csoler
dc3624945f
fixed uninitialized memory read and inconsistent initialization of mReputationScore in GxsReputation 2019-12-23 11:52:32 +01:00
csoler
93cd6a5df1
fixed possible data race in mNotifications 2019-12-19 21:03:08 +01:00
Gioacchino Mazzurco
655582e970
Improve license according to REUSE 3.0 
FSFE licensing checking program lint is now happy

$ reuse lint

* Bad licenses:
* Missing licenses:
* Unused licenses:
* Used licenses: AGPL-3.0-only, AGPL-3.0-or-later, Apache-2.0, CC-BY-SA-4.0, CC0-1.0, GPL-3.0-or-later, LGPL-3.0-or-later, MIT
* Read errors: 0
* Files with copyright information: 6324 / 6324
* Files with license information: 6324 / 6324

Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)
 2019-12-18 17:57:20 +01:00
csoler
3d7ae59df7
changed enum to enum class and made names globally more consistent for RsEvents 2019-12-17 21:41:21 +01:00
csoler
d7504c59b5
fixing compilation on Travis CI 2019-12-17 15:29:47 +01:00
csoler
baaa67d225
changed NO_ERROR enum into something less likely to collide with existing define 2019-12-17 15:16:24 +01:00
csoler
bdf5d0f753
changed RsGxsForumNotifyRecord into more appropriate RsGxsGroupNotifyRecord 2019-12-17 14:10:18 +01:00
csoler
a54cf981a6
fixed forum/channel subscribe notifications 2019-12-16 22:44:37 +01:00
csoler
11c520d280
replaced QString output of uniqueIdentifier() in feedItem classes by a std::string because QString caused random crashes 2019-12-15 16:46:22 +01:00
csoler
da6e7f9e9b
fixed conflicts with master 2019-12-14 18:27:41 +01:00
csoler
3a3fc25205
finished removing last AddFeedItem from msg, posted, forums and channels 2019-12-13 23:40:21 +01:00
csoler
4fe6e46410
added handling of channel, forum and posted events in GUI 2019-12-12 21:23:42 +01:00
csoler
eef5a5a8ef
added new events for circles 2019-12-12 00:00:51 +01:00
Gioacchino Mazzurco
2a0e1ab59d
Fix Android compilation 
Fix also a couple of warnings and update build documentation
 2019-12-11 01:25:14 +01:00
G10h4ck
d1b86400bc
Merge pull request #1695 from G10h4ck/gxs_invites 
GXS groups links
 2019-12-10 22:17:33 +01:00
csoler
27793627e3
moved GxsChanges to rsEvents 2019-12-09 22:19:03 +01:00
csoler
e402630095
attempt to fix thread race between rsEvents and TokenQueue 2019-12-08 21:34:52 +01:00
csoler
b6ca07aaa3
fixed bug caused by accessing Settings from non Qt thread 2019-12-07 22:26:26 +01:00
csoler
f118b4656e
moved more peer connection notifications to rsEvents 2019-12-07 21:43:28 +01:00
csoler
9790b98605
fixed "connexion refused by peer" message 2019-12-06 22:45:33 +01:00
csoler
bb10b82c8e
moved refused connect attempt event to RsAuthSslConnectionAuthentication 2019-12-05 23:43:38 +01:00
csoler
c48aff44b2
removed set/get CurrentConnectionAttemptInfo because it was both prone to error and useless 2019-12-05 22:12:36 +01:00
csoler
00c74f0956
moved rsevent for incomplete cert info to the right place so that it does not trigger when a connection from a non friend is denied 2019-12-04 22:24:11 +01:00
csoler
fcbecbaa16
fixed errors reported by review of PR1735 2019-12-03 21:28:44 +01:00
csoler
65fa54c206
using new notification system for connection attempts 2019-12-02 20:53:51 +01:00
csoler
b799f18df8 fixed early crash caused by calling rsBanList before it is initialized 2019-12-02 13:14:56 +00:00
felisucoibi
c9aab51c7c
Update hash_cache.cc 2019-12-01 23:01:20 +01:00
csoler
d8569d813c
switched security items to new notification system 2019-12-01 22:35:16 +01:00
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
Gioacchino Mazzurco
294b1e9100
Implement RsGxsForums link import/export 2019-10-29 12:10:33 +01:00
Gioacchino Mazzurco
c3fa2c6c1c
Implement rsIdentity link import/export 2019-10-29 12:10:33 +01:00
Gioacchino Mazzurco
d9a8c5c09f
Implement links for RsGxsChannels 2019-10-29 12:10:33 +01:00
Gioacchino Mazzurco
6a797cd073
Implement GXS Circle link based on GXS group base64 2019-10-29 09:30:52 +01:00
Gioacchino Mazzurco
6f3d842d30
Implement GXS group base64 public data export 
Link to GXS group is a concept that is useful for almost all GXS based
  services, gen exchange now provides method to facilitate the
  implementation of group links at service layer.
Move waitToken in token service interface.
 2019-10-29 09:30:51 +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
Gioacchino Mazzurco
63b71e383a
Add support for indexing files dupported by taglib 
Add FLAC standalone indexer
Add indexing common music tags for all formats supported by taglib
File indexer reindex files that have been indexed by older versions of
  the indexer and reindex them
Sparse improvements to deep indexing
 2019-10-26 15:57:39 +02:00
Gioacchino Mazzurco
3a26ccf6a5
Implement deep indexing for files through Xapian 
ATM it support extracting metadata only from OGG files.
The system has been designed to be easly extensible to more file formats
  registering more indexer functions which just need to extract metadata
  from a certain type of file and feed it to Xapian.
The system has been integrated into existent file search system to
  through generric search requests and results, it keep a good level of
  retro-compatibility due to some tricks.
The indexing system is released under AGPLv3  so when libretroshare is compiled
  with deep search enabled AGPLv3 must be honored instead of LGPLv3-or-later.
Cleaned up the debian copyright file using non-deprecated license
  code-names.
 2019-10-26 15:57:38 +02:00
Gioacchino Mazzurco
9a8248c1a2
Rename RS mail tracker id type according to Cyril suggestion 2019-10-26 15:21:21 +02:00
Gioacchino Mazzurco
e530616c53
Fix more warnings in message service 2019-10-26 14:50:16 +02:00
Gioacchino Mazzurco
45b623b2ce
Update copyright header + fix warning 2019-10-26 07:58:05 +02:00
Gioacchino Mazzurco
c9b5b8bbd4
isKnownId return true also for own identities 2019-10-26 01:22:51 +02:00
Gioacchino Mazzurco
ae0412c087
sendMail check if recipients are known 2019-10-26 01:22:51 +02:00
Gioacchino Mazzurco
d673ef3256
Fix compile warning in RsMsg 2019-10-26 01:22:51 +02:00
Gioacchino Mazzurco
bdad0036f5
sendMail check if from is own identity 2019-10-26 01:22:50 +02:00
Gioacchino Mazzurco
3401e8b49d
Add serialization for slice info 2019-10-26 01:22:50 +02:00
Gioacchino Mazzurco
828251cc18
Solve vtable warnings in gxschannels 2019-10-26 01:22:47 +02:00
Gioacchino Mazzurco
bc3596047a
Remove unused class in rsmsg 2019-10-26 00:07:56 +02:00
Gioacchino Mazzurco
f2c90ba3c6
RS mail post event when receiving a mail 
+ delete some deadcode
 2019-10-26 00:07:55 +02:00
Gioacchino Mazzurco
04d3325fbd
Provide usable API to send RS mails 
Return trackid to sendmail caller
Post RsEvents when sent mail change status
Deprecate old MessageSend
 2019-10-26 00:07:51 +02:00
G10h4ck
584918388c
Merge pull request #1691 from G10h4ck/fixup_brodcastdiscovery 
Fix some bugs in broadcast discovery
 2019-10-25 23:06:13 +02:00
G10h4ck
63861ba942
Merge pull request #1659 from G10h4ck/netmgr_calmer 
Calm down p3netmgr at least when internet connection is not available
 2019-10-25 18:42:45 +02:00
Gioacchino Mazzurco
7f2bfae104
Fix broadcast discovery in Android 
On Android and potencially other mobile platforms, WiFi drivers are configured
  by default to discard any packet that is not directed to the unicast mac
  address of the interface, this way they could save some battery but breaks
  anything that is not unicast, such as broadcast discovery. To solve this
  problem On such platforms provide methods to handle low level multicast
  listening so we can receive advertisement from same broadcast domain nodes.
 2019-10-25 18:08:50 +02:00
csoler
f78b591214 fixed compilation 2019-10-23 18:16:31 +00:00
csoler
578a514007
fixed bug causing option -p to not allow to change listenning port 2019-10-23 20:11:30 +02:00
Gioacchino Mazzurco
48267eb659
Fix fingerprint assignation in broadcastdiscovery 
This bug was causing null fingerprint reported on peer discovered by
  broadcastdicovery effectively rendering it unfunctional
 2019-10-18 23:09:16 +02:00
csoler
438966979b
Merge pull request #1674 from G10h4ck/pqissludp_fixup 
Fix double free crash in ~pqissludp()
 2019-10-15 08:39:49 +02:00
csoler
98c1a34ab9
Merge pull request #1683 from defnax/distant-chat-settings 
added distant chat settings for store/load
 2019-10-14 13:41:52 +02:00
csoler
52b675fb6d
Merge pull request #1680 from csoler/v0.6-DistantChat 
enabled buffering for distant chat, so that msgs are sent when the tu…
 2019-10-14 13:39:08 +02:00
defnax
cbfe49f0f3 added distant chat settings 2019-10-14 02:29:20 +02:00
csoler
b3156223af
fixed load/save of chat history for distant chat 2019-10-14 00:07:11 +02:00
csoler
09343e9179
enabled buffering for distant chat, so that msgs are sent when the tunnel is ok 2019-10-12 21:05:27 +02:00
Gioacchino Mazzurco
f86d20d4cd
Improve readibility of terrible if 2019-10-09 15:22:24 +02:00
Gioacchino Mazzurco
63b787a504
Fix double free crash in ~pqissludp() 
Use POD type member intitialization for sockaddr_storage
Cleanup a bunch of clutter
 2019-10-09 14:59:46 +02:00
Gioacchino Mazzurco
93bfbb6ede
Fix addSslOnlyFriend when adding with already known PGP 
If the PGP key is available add as full friend.
Without this change when the PGP key of a non-friend is available
  the SSL-id is added in peer list but the PGP-id is not added as PGP
  friend, at same time skip_pgp_signature_validation is false, because
  we have the full PGP, so the connection attempt is refused, when it
  should be verified with PGP and accepted.
 2019-10-09 02:06:55 +02:00
Gioacchino Mazzurco
1b071d106f
Fix p3GxsChannels::createCommentV2 2019-10-07 18:37:44 +02:00
Gioacchino Mazzurco
ab93d31d17
Remove some RsPeers related dead code 2019-10-06 23:20:18 +02:00
Gioacchino Mazzurco
563260d012
Merge branch 'master' of github.com:RetroShare/RetroShare 2019-10-06 23:05:11 +02:00
Gioacchino Mazzurco
89819dd945
Add JSON API to list PGP friends 2019-10-06 23:03:14 +02:00
csoler
c0e8aa1024
Merge pull request #1596 from hunbernd/feature/risechatlenght 
Rise public chat message size
 2019-10-06 22:16:09 +02:00
Gioacchino Mazzurco
db3aefcd0b
Improve error reporting in createChannelV2 2019-10-05 15:53:46 +02:00
Phenom
5c46a8fd4d Fix implicitly-declared operator= warnings 
/libretroshare/src/gxs/rsgds.h:54: warning: implicitly-declared
'ContentValue& ContentValue::operator=(const ContentValue&)' is
deprecated [-Wdeprecated-copy]
   54 |     MsgLocMetaData(const MsgLocMetaData& meta){ msgId =
meta.msgId; val = meta.val;}

/libretroshare/src/gxs/rsgds.h:69: warning: implicitly-declared
'ContentValue& ContentValue::operator=(const ContentValue&)' is
deprecated [-Wdeprecated-copy]
   69 |     GrpLocMetaData(const GrpLocMetaData& meta){ grpId =
meta.grpId; val = meta.val;}

From 248 to 146 warnings.
 2019-10-04 17:28:50 +02:00
csoler
b539ebe826
Merge pull request #1646 from G10h4ck/fixup_channels_api 
Avoid crash when subscribeToChannel is fed with invalid channel id
 2019-10-03 20:31:31 +02:00
csoler
423f20231c
Merge pull request #1661 from G10h4ck/short_invites_fixup 
Fix setting port when adding from short invite with dyndns
 2019-10-03 09:40:28 +02:00
Gioacchino Mazzurco
b77924b368
Fix setting port when adding from short invite with dyndns 2019-10-01 17:43:52 +02:00
G10h4ck
1732177669
Merge pull request #1645 from G10h4ck/short_invites_fixes 
Allow friend information  update from short invite
 2019-09-30 23:37:55 +02:00
csoler
f04b32eef8
Merge pull request #1650 from csoler/v0.6-ShortInvites 
fixed error handling when you enter your own certificate in connect f…
 2019-09-30 21:46:52 +02:00
Gioacchino Mazzurco
6b71c57a54
Calm down p3netmgr at least when internet connection is not available 
Solve compiler warnings, delete tons of cruft and deadcode
 2019-09-29 17:59:32 +02:00
csoler
e41b64d938
added checksum section to short certificate format 2019-09-29 17:37:52 +02:00
Gioacchino Mazzurco
6788ea041a
Avoid netReset() if no network address is available 2019-09-28 18:42:13 +02:00
Gioacchino Mazzurco
1e9adc1e23
Add some documentation and fix some compiler warnings 2019-09-28 14:34:07 +02:00
Gioacchino Mazzurco
4e3ac4a9f4
Make SSL-only friend criteria stricter 2019-09-28 14:15:12 +02:00
Gioacchino Mazzurco
c07f93992c
Merge branch 'master' of github.com:RetroShare/RetroShare 2019-09-28 13:57:28 +02:00
Gioacchino Mazzurco
a169250e1c
Add support to build with miniupnpc on Android 
Necessary to workaroud issues:
  https://github.com/RetroShare/RetroShare/issues/1649
  https://github.com/mrjimenez/pupnp/issues/119
 2019-09-28 13:54:16 +02:00
Gioacchino Mazzurco
5660c73175
Allow friend information update from short invite 
Add comments explaining security of addSslOnlyFriend
 2019-09-28 10:36:33 +02:00
Gioacchino Mazzurco
3b8f6997bb
Avoid crash when subscribeToChannel is fed with invaled channel id 
Fix a couple compiler warning too
 2019-09-28 00:12:56 +02:00
G10h4ck
1480e6d0b5
Merge pull request #1644 from G10h4ck/broadcast_discovery_fingerprint 
Send PGP fingerprint in broadcast discovery
 2019-09-27 23:48:37 +02:00
Gioacchino Mazzurco
86957c9843
Fail gracefully when requesting membership on an unknown circle 2019-09-27 16:57:07 +02:00
Gioacchino Mazzurco
ce3e2a2c9d
Fixup missing parametersin circle creation 2019-09-27 14:19:20 +02:00
Gioacchino Mazzurco
1705a930d4
getLocalAddresses should not need Qt for android >= 24 2019-09-25 22:15:07 +02:00
Gioacchino Mazzurco
a887d205e9
Relax RsEvent loop 2019-09-25 22:12:04 +02:00
Gioacchino Mazzurco
2aade543f3
Send PGP full fingerprint in broadcast discovery 2019-09-25 16:33:13 +02:00
csoler
24781a71f5
removed unused mOthersList from PeerMgr 2019-09-23 21:32:28 +02:00
csoler
282d2d324d
added missing notifications when adding friends 2019-09-22 20:42:49 +02:00
csoler
9b78447109
used RsInfo instead of std::cerr in authssl.cc 2019-09-22 17:36:08 +02:00
csoler
19ced52a02
fixed bug caused by wrong reading of disc flag 2019-09-22 17:05:22 +02:00
csoler
9c7edffc21
fixed bug caused by shadowing a variable 2019-09-22 16:34:01 +02:00
csoler
6919711f48
restricted check for matching PGP ids to short invites only, since otherwise the call to isGPGAccepted() will rule out wrong IDs anyway 2019-09-21 22:20:33 +02:00
csoler
ed864f9470
removed some debug info about PGP signature validation, and added the ability to accept fingerprint instead of ID in the handshake 2019-09-21 19:00:52 +02:00
csoler
4fabf3deb1
renamed skip_signature_validation into more appropriate skip_pgp_signature_validation 2019-09-19 21:14:57 +02:00
csoler
654d760d84
fixed comments from review of PR 2019-09-19 20:59:35 +02:00
csoler
18db1fb6bb
Merge pull request #1642 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2019-09-18 23:24:27 +02:00
csoler
af9b3647dd
fixed bug causing local port to randomly change at start 2019-09-18 23:02:15 +02:00
csoler
9bf86e0e66
suppressed two uninitialized memory reads 2019-09-18 22:36:56 +02:00
csoler
44d6cb7be2
finished documentation/review of discovery 2019-09-17 22:43:37 +02:00
csoler
32b4312725
improved security checks in authssl by verifying that the supplied PGP id is the one the peer has been registered with 2019-09-17 22:14:32 +02:00
csoler
8be49b2d65
Merge pull request #1639 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2019-09-17 18:50:37 +02:00
csoler
b4fe1d48e5
started documenting p3GossipDiscovery 2019-09-16 23:00:00 +02:00
csoler
1f058f9f22
fixed compilation 2019-09-15 16:49:30 +02:00
csoler
636d477aea
fixed bug causing JSon api server to start twice, and therefore stopping RS because the port was already listen to 2019-09-15 16:21:12 +02:00
Gioacchino Mazzurco
e411b7fb22
Clean some dust 2019-09-15 12:10:37 +02:00
Gioacchino Mazzurco
6862e642e8
Provide more usable method to create GXS circles 
Fix some compiler warnings with out of definition default destructors
 2019-09-14 20:58:04 +02:00
csoler
bea6769a4e
removed unused code from p3gossipdiscovery 2019-09-14 16:26:24 +02:00
csoler
a20ec1a885
fixed exchange of PGP keys in binary format and update of PGP signature flags on short invites when the key is received 2019-09-14 15:33:43 +02:00
Gioacchino Mazzurco
c2cb63b40c
RsIdentity update own ids cache on creation 2019-09-12 12:02:24 +02:00
csoler
bbf92bd5f3
fixed remanent bug due causing the deletion of rsEvent 2019-09-10 21:59:25 +02:00
Gioacchino Mazzurco
06840b86f5
Fix retroshare-service Android build 
Cleanup retroshare-service and build options
 2019-09-10 17:10:26 +02:00
csoler
3a58aa468f
add special profile item for not yet validated peer from short invite 2019-09-10 09:52:37 +02:00
csoler
4f4b3bfcdb
Merge pull request #1624 from csoler/v0.6-RetroshareService 
V0.6 retroshare service
 2019-09-09 10:33:18 +02:00
Gioacchino Mazzurco
6aa85ea292
Fix a couple of warning in JSON serializer 2019-09-09 09:08:00 +02:00
csoler
c8064e1ddc
fixed missing parameter in jsonapi declaration 2019-09-08 20:50:06 +02:00
csoler
dd90314c3d
fixed missing type conversion 2019-09-08 20:49:38 +02:00
csoler
6419b03a2a
merged upstream/master 2019-09-08 20:35:23 +02:00