Commit Graph

14343 Commits

Author SHA1 Message Date
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
defnax
ea214d18e6 Removed a unnecessary frame from WikiDialog & correcting indentations
* Removed a unnecessary frame from WikiDialog & correcting indentations
* Removed unused icons
2020-03-15 17:29:05 +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
70d0c7b1b3
quick workaround to avoid crash in loadCircles() 2020-03-12 22:12:06 +01:00
defnax
9a5f839550 fixing some layout issues on the search frame 2020-03-12 21:43:58 +01:00
defnax
5708be6472 Removed some default stylesheets from ChatWidget & Messages 2020-03-12 19:53:37 +01: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
aa05348d55
removed token queue from PostedCreatePostDialog 2020-03-11 22:41:19 +01:00
defnax
5af0945fb8
Merge pull request #91 from RetroShare/master
update to master
2020-03-10 19:19:09 +01:00
csoler
b8cab68885
Merge pull request #1821 from defnax/Cleanup-&-remove-old-with-new-icons
Cleanup & remove old with new icons
2020-03-10 19:04:04 +01:00
defnax
10c20ae2c6 restored the tab icon size to the default for Messages 2020-03-10 16:55:16 +01:00
defnax
3cc0adab22 Added to count own groups too 2020-03-09 23:22:52 +01:00
csoler
401c4f26ba
Merge pull request #1820 from defnax/fixing-settings-pages
Fixing settings pages
2020-03-09 22:47:45 +01:00
csoler
44f346a0a4
Merge pull request #1827 from defnax/Login-dialog-centered
Put the Login Dialog in the screen center of the window
2020-03-09 22:29:18 +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
defnax
15afbc32cf Removed unnecessary icons from main tree Channel & Forums
* Removed unnecessary icons from the main tree Channel & Forums
* Fixed to display the Flag icon for the Distribution column
2020-03-09 16:53:27 +01:00
defnax
cff0fad937 Put the Login Dialog in the acreen center of the window 2020-03-09 14:12:20 +01:00
defnax
180cb7aeed
Merge pull request #90 from RetroShare/master
update to master
2020-03-09 14:08:23 +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
8a2508109a
Merge pull request #1819 from csoler/v0.6-FT4
attempt to fix crashes in IdDialog::loadCircles()
2020-03-07 16:17:58 +01:00
csoler
1f0678075f
merged upstream/master 2020-03-06 22:12:06 +01:00
csoler
e5b53e5646
Merge pull request #1825 from G10h4ck/android_fix_debug_crash
Fix crash on Android due to dangling reference
2020-03-06 22:00:08 +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
defnax
991c07116b added missed icon 2020-03-06 16:16: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
defnax
a480d995d6 Set the TextBrowser transparent for better look 2020-03-06 00:22:53 +01:00
defnax
6ac03ecf7c moved share flags label to the Directories tab 2020-03-05 22:31:16 +01:00
defnax
4f23343c91
Merge pull request #88 from RetroShare/master
update to master
2020-03-05 21:33:10 +01:00
defnax
5eb62a96a6 added back the changes for icons.qrc 2020-03-05 21:25:12 +01:00
defnax
e11c83f833
Merge pull request #89 from RetroShare/master
update to master
2020-03-05 21:22:24 +01:00
defnax
a0f151b252 restore icons back 2020-03-05 21:20:16 +01:00
defnax
4acbb062eb removed unused defines 2020-03-05 21:11:16 +01:00
csoler
4bacdb8de4
Merge pull request #1818 from defnax/fix-photos-icon
Fixing the missed album create icon
2020-03-05 21:09:40 +01:00
csoler
491bbad8a1
Merge pull request #1822 from csoler/v0.6-BugFixing
fixed 2 bugs causing forums and channels to be notified when already …
2020-03-05 21:04:43 +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
defnax
06b0600e6a update icons 2020-03-05 16:09:00 +01:00
defnax
22fa7b15e9 update icon & screenshots 2020-03-05 15:36:19 +01:00
defnax
a1ca048082 cleanup & update some icons 2020-03-05 02:10:45 +01:00
csoler
48d09b5867
fixed bug in calling setItemWidget on a possibly null item 2020-03-04 22:43:17 +01:00