Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,600 Commits 63 Branches 22 Tags 196 MiB
f2c90ba3c6
Commit Graph

13600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
csoler
56444c2ad2
fixed appveyor deploy for retroshare-service 2019-09-08 15:27:51 +02:00
csoler
9188d18a90
attempt to fix compilation on windows 2019-09-08 14:35:45 +02:00
csoler
718a8bafa3
attempt to fix compilation on windows 2019-09-08 14:04:39 +02:00
csoler
0388702f3d
attempt to fix compilation on macOS 2019-09-08 13:57:38 +02:00
csoler
b620b63677
attempt to fix compilation on windows 2019-09-08 11:36:41 +02:00
csoler
63b56350ca
attempt to fix compilation on windows 2019-09-08 11:02:34 +02:00
csoler
3a63ffaf5d
added missing ifdef around jsonapi include 2019-09-08 10:29:24 +02:00
csoler
5b5ad6e6f6
added missing iostream for windows 2019-09-07 13:40:45 +02:00
csoler
2e5821bf59
fixed compilation without RS_JSONAPI 2019-09-06 23:50:39 +02:00
csoler
ad443ecaa4
fixed compilation without RS_JSONAPI 2019-09-06 23:40:04 +02:00
csoler
ccd8c7186d
fixed compilation without RS_JSONAPI 2019-09-06 23:28:04 +02:00
csoler
4a085cf223
removed termios include causing windows compilation to fail 2019-09-06 23:15:21 +02:00
csoler
f182b358f4
fixed compilation in new getpass method 2019-09-06 22:51:10 +02:00
csoler
af65ac1aa8
disabled libresapi httpserver as well 2019-09-06 22:28:15 +02:00
csoler
c365a96489
moved getpass() method into a cross-plateform file rskbdinput.h/cc 2019-09-05 23:54:48 +02:00
csoler
bd0e4d7fba
fixed initialization of RsConfigOptions 2019-09-05 23:07:07 +02:00
csoler
9bbd6d49df
fixed disabling libresapi in retroshare.pri 2019-09-05 23:06:06 +02:00
csoler
23a7a0876a
disabled cmark by default, which was enabled as a side effect of previous PR 2019-09-05 22:21:39 +02:00
G10h4ck
c8f4f8ca04
Merge pull request #1632 from PhenomRetroShare/Fix_CMark_CompilWithQtCreator 
Fix CMark Compilation with QtCreator
 2019-09-05 19:46:24 +02:00
Benjamin Wright
c85040e77e fixed typo strenghten => strengthen across all locations 2019-09-05 09:17:21 -04:00
csoler
048beaf27a
Merge pull request #1631 from csoler/v0.6-FriendList 
show best icon for not expanded profiles in friend list
 2019-09-05 13:20:41 +02:00
Phenom
2922bc92a8 Fix CMark Compilation with QtCreator 2019-09-05 05:28:37 +02:00
csoler
e0623e6178
fixed default avatar when no locations available 2019-09-04 21:42:21 +02:00
csoler
81e9cd1c51
show best icon for not expanded profiles in friend list 2019-09-04 21:35:17 +02:00
csoler
b7ff7373c1
improved ui of retroshare service 2019-09-02 22:13:12 +02:00
G10h4ck
e31b7c2816
Merge pull request #1607 from PhenomRetroShare/Fix_CMark_Compil 
Fix CMark compilation
 2019-09-02 16:28:45 +02:00
G10h4ck
06a158e677
Merge pull request #1628 from G10h4ck/gxs_sqlite_sqlcipher_compat 
Improve SQLCipher/SQLite support
 2019-09-02 16:28:26 +02:00
csoler
49b0fdf3aa
Merge pull request #1626 from csoler/v0.6-Threads 
added destructor in RsTickingThread calling for fullstop, which preve…
 2019-09-01 16:59:10 +02:00
Gioacchino Mazzurco
6edf503ae0
Improve SQLCipher/SQLite support 
When compiled with SQLCipher it is now capable of handling databases
  created by SQLite-only versions
Add support for SQLCipher on Android arm64
 2019-08-31 16:22:24 +02:00
csoler
d507f7ea23
fixed compilation warning 2019-08-30 22:11:33 +02:00
csoler
b4bfdf2e25
fixed shutdown callback issue in retroshare-service.cc 2019-08-30 22:09:47 +02:00
csoler
1bf07f72c4
added destructor in RsTickingThread calling for fullstop, which prevents the crash due to threads being killed when still running 2019-08-30 21:47:17 +02:00
csoler
7d9db1fc22
added destructor in RsTickingThread calling for fullstop, which prevents the crash due to threads being killed when still running 2019-08-30 21:44:05 +02:00
csoler
840402970c
removed libresapi from defautl compilation 2019-08-30 21:41:34 +02:00
csoler
b8398aae07
moved passwd request for webui to a more appropriate place 2019-08-30 21:16:00 +02:00
csoler
a51259beb5
Merge pull request #1625 from csoler/v0.6-FriendList 
fixed connection for "deny friend" function in FriendList
 2019-08-30 14:05:58 +02:00
csoler
15e6947b07
use queued connections for notification signals in friend list, added a call to begin/endResetModel() 2019-08-30 13:57:27 +02:00
csoler
4d96c71942
fixed connection for "deny friend" function in FriendList 2019-08-30 11:11:40 +02:00
csoler
ab5da5ebf5
switched to RsLoginHelper for login attempt in rs-service. Moved commandline arguments to main executable using a new struct named RsConfigOptions 2019-08-29 23:15:46 +02:00
Gioacchino Mazzurco
9f04e1c9c2
Update udp-discovery-cpp and android openssl 2019-08-29 15:52:07 +02:00
csoler
158da65fc4
added passwd request for webUI at start of rs-service. All this should be later handled using commandline options 2019-08-29 10:57:15 +02:00
Gioacchino Mazzurco
2d7b855983
More fixes in JSON API 
Schedule delayed async session closing properly (without recurrence)
Fix double capture of this in async method registering, that was causing
  compilation error for Android
Fix minor compiler warning in jsonapi-generator
 2019-08-29 01:24:51 +02:00
G10h4ck
76dfa04bb5
Merge pull request #1621 from G10h4ck/jsonapi_async_crash_fix 
Fix sporadic crash in JSON API async calls
 2019-08-28 23:42:02 +02:00
G10h4ck
9f95649bbc
Merge pull request #1623 from G10h4ck/fix_crash_in_p3banlist 
Protect p3BanList::isAddressAccepted with mutex
 2019-08-28 23:39:08 +02:00
Gioacchino Mazzurco
85ef0e0940
Protect p3BanList::isAddressAccepted with mutex 
This method is called from other threads and apparently caused
  a sporadic crash caought on Android.
See retroshare://forum?name=Got%20crash%20on%20Android%20with%20GDB%20backtrace&id=95de1451952d8c38cb1cdfdb85eed986&msgid=ac8c9d41f2cd0c9e8e290433c7f296fecb2d62b3
 2019-08-28 23:29:41 +02:00
csoler
ac8043806b
Merge pull request #1622 from csoler/v0.6-FriendList 
increased spacing for groups to fit the group icon in friendlist
 2019-08-28 20:57:26 +02:00
Phenom
d681136831 Fix CMark compilation 
Remove cmark_node_mem as cmark_node_free do the job.
Look at man:
https://github.com/commonmark/cmark/blob/master/man/man3/cmark.3#L141
 2019-08-28 04:53:47 +02:00
csoler
90d0686e88
removed Qt from unix version of retroshare service. Enabled loging at start with option -u 2019-08-27 21:54:17 +02:00