Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,930 Commits 63 Branches 22 Tags 194 MiB
476b581506
Commit Graph

10930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
b96effb2d2 Merge pull request #895 from PhenomRetroShare/Add_HelpInRelayTab 
Add help in Relay setting tab.
 2017-06-28 22:37:50 +02:00
csoler
3550971f95 Merge pull request #902 from Emotyco/libresapi_avatar_handlers 
Added: Avatar handlers in libresapi
 2017-06-28 22:37:05 +02:00
csoler
12b562893d added more debug info in GxsUtil 2017-06-27 22:21:35 +02:00
csoler
51c7e18a3a added last msg time in GxsTrans stats. Added mutex to protect non atomic mPreferredGroup 2017-06-27 19:56:21 +02:00
csoler
579c944ac3 Merge pull request #903 from sehraf/improve-server-page 
hide hidden service port for I2P instead of just disabling it
 2017-06-25 21:50:51 +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
Konrad
e128fcbd87 Added: Creating identity with avatar in libresapi 2017-06-25 15:35:23 +02:00
Konrad
54166cec86 Added: Handling requests to set and get identity avatar 2017-06-25 14:30:38 +02:00
csoler
c3a78ce16a Merge pull request #900 from csoler/v0.6-GxsTransport 
fixed mismatched free/delete[] in AvatarDefs
 2017-06-24 13:14:24 +02:00
csoler
8c4396caf9 Merge pull request #899 from Emotyco/libresapi_wrong_password_notification 
Fixed: Information about wrong password in libresapi
 2017-06-24 12:54:06 +02:00
Konrad
66a9dadb98 Fixed: Information about wrong password 2017-06-24 12:05:32 +02:00
Konrad
2aac999568 Fixed: Duplication of handler declaration 2017-06-24 12:02:28 +02:00
csoler
332feddb17 fixed mismatched free/delete[] in AvatarDefs 2017-06-24 11:38:48 +02:00
csoler
2bb49f6925 Merge pull request #898 from csoler/v0.6-GxsTransport 
fixed memory leak in GxsTrans
 2017-06-23 21:58:54 +02:00
csoler
0f99647a86 fixed memory leak in GxsTrans 2017-06-23 21:58:17 +02:00
csoler
25a71c99e1 Merge pull request #897 from PhenomRetroShare/Fix_ChannelPostButton 
Fix GxsChannelPostItem button, like "download" or "Play" never shown.
 2017-06-23 21:24:37 +02:00
Phenom
adfc5949c0 Fix GxsChannelPostItem button, like "download" or "Play" never shown. 2017-06-23 20:33:43 +02:00
Phenom
c415e11fa2 Add help in Relay setting tab. 2017-06-22 18:59:05 +02:00
csoler
07ecbec691 fixed bug in makeSourcePackage which would always grab the release branch 2017-06-22 18:05:39 +02:00
csoler
8b901964d7 updated changelog 2017-06-22 09:12:18 +02:00
csoler
c34165e3b7 pushed new changelog to force update of the date... 2017-06-22 09:00:16 +02:00
csoler
8950acc701 Merge pull request #892 from PhenomRetroShare/Add_MoveRelayPageToNetwork 
Move Relay setting page to network one.
 2017-06-22 00:39:03 +02:00
Phenom
ea8af8acb3 Move Relay setting page to network one. 2017-06-21 18:38:52 +02:00
csoler
8cc82f9d85 Merge pull request #891 from PhenomRetroShare/Fix_MessageToHeight 
Fix To, Cc & Bcc height in MessageWidget.
 2017-06-21 18:32:51 +02:00
csoler
812e606831 fixed changelog for typo 2017-06-21 08:05:17 +02:00
csoler
1f9320c445 updated changelog 2017-06-21 08:05:17 +02:00
csoler
310c848ca5 Merge pull request #890 from G10h4ck/qml_app_identity_avatar 
Qml app identity avatar
 2017-06-21 07:42:15 +02:00
Phenom
c46c747e04 Fix To, Cc & Bcc height in MessageWidget. 2017-06-21 06:35:48 +02:00
Gioacchino Mazzurco
1d031910cb Created a dedicated component for avatar image 2017-06-20 17:16:27 +02:00
Gioacchino Mazzurco
8c62c2a326 Qml app: show contact avatar in details if available 2017-06-20 15:35:05 +02:00
Gioacchino Mazzurco
b206015e70 libresapi: expose identity avatar in JSON API 
The avatar is sent as a base64 string

The solution is not optimal but is the best we can do inside a JSON and
it's acceptable for the moment
 2017-06-20 15:33:28 +02:00
csoler
0133be757a Merge pull request #887 from csoler/v0.6-GxsTransport 
V0.6 gxs transport
 2017-06-17 23:07:10 +02:00
csoler
12a45294a3 added ifdef for comments on GxsTrans 2017-06-17 23:02:28 +02:00
csoler
eb4bb5be65 fixed bug in gxs trans stats counting 2017-06-17 21:42:00 +02:00
csoler
43dcddce67 Merge pull request #880 from PhenomRetroShare/Add_GxsCircleNotify 
Add Circle Feed Item.
 2017-06-16 12:37:09 +02:00
csoler
a29bc4408e Merge pull request #874 from G10h4ck/silent_initiate_distant_chat_api 
libresapi: silent /chat/initiate_distant_chat
 2017-06-16 12:24:45 +02:00
csoler
12eed8ef79 Merge pull request #884 from sehraf/pr-fix-bob-settings 
fix bug in BOB settings
 2017-06-16 12:22:57 +02:00
csoler
25565a7ecd merged upstream/master 2017-06-15 23:58:29 +02:00
csoler
6633b04a44 changed constants for GxsTransport anti-spam 2017-06-15 23:57:02 +02:00
csoler
26bb865d29 added code to reject messages based on existing per-user statistics 2017-06-15 19:32:31 +02:00
sehraf
65ab68b4f7 fix stop button being wrongly disabled 2017-06-15 07:22:33 +02:00
sehraf
fe5ec8bda8 reduce BOB log level 2017-06-15 07:06:52 +02:00
csoler
09ff94c9ec added new virtual method to refuse incoming msgs (similar to groups) in RsGenExchange, and used it in p3GxsTrans to refuse msgs from peers who send too much 2017-06-14 23:19:52 +02:00
csoler
c451d3a12c Merge pull request #873 from RetroPooh/tunnstats 
stats tunnels rearranged columns for better readablilty
 2017-06-12 22:18:34 +02:00
csoler
1e7feecdf0 Merge pull request #882 from topcat/iss879 
Included QStringList header in ApiServerLocal.cpp [Issue 879]
 2017-06-12 22:16:46 +02:00
csoler
79825eb2e2 fixed thread issue in RsGxsCleanupThread that caused random crashes 2017-06-12 20:36:02 +02:00
Jeetu Golani
80ec9b7321 Included QStringList header in ApiServerLocal.cpp [Issue 879] 2017-06-12 15:51:26 +05:30
Phenom
aa64c4d3c5 Add Circle Feed Item. 2017-06-11 16:16:41 +02:00
csoler
1766087f71 fixed update notification and display in GxsTransStatistics 2017-06-07 23:10:59 +02:00
csoler
9853b53f8b fixed debug output in GxsNetService 2017-06-07 23:10:24 +02:00