Commit Graph

10812 Commits

Author SHA1 Message Date
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
csoler
7691a8ef2f removed debug info 2017-06-07 21:41:20 +02:00
csoler
4cb7522feb added deleted gxs messages to the reject list of GxsNetService to avoid re-downloading them right away 2017-06-07 21:41:00 +02:00
Gioacchino Mazzurco
edd82d0ef2 libresapi: stop assuming first chat message is own 2017-06-07 21:37:03 +02:00
csoler
318ea310f8 fixed layout of GxsTrans stats 2017-06-07 20:14:27 +02:00
csoler
23156ab4b1 fixed malloc problem when chat avatar is missing 2017-06-07 20:14:27 +02:00
cyril soler
e726bd1061 attempt to fix the crash in DataStore by not calling deleteMsgs directly 2017-06-07 13:37:55 +02:00
csoler
39f003f9f9 Merge pull request #875 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-06-06 22:00:08 +02:00
Gioacchino Mazzurco
528317d374 libresapi: silent /chat/initiate_distant_chat
Avoid to forge the
[Starting distant chat. Please wait for secure tunnel to be established]
message on requesting chat id from API as it is a nuisance in most
libresapi use cases
2017-06-06 18:57:32 +02:00
csoler
f62028b2c1 moved metadata info to members of OutgoingRecord, so that the un-serialized meta is not lost when saved. Ensured backward compatibility when reloading old items. 2017-06-06 00:15:06 +02:00
csoler
1e652d6577 reduced number of calls to indicateConfigChanged(), and renamed mIngoingQueue into mIncomingQueue in GxsTrans 2017-06-05 22:27:54 +02:00
csoler
0098433242 Merge pull request #871 from Emotyco/changed_socket_path_windows
Changed: Unified socket path across systems.
2017-06-05 21:51:59 +02:00
csoler
b7c09bd6cf added calls to indicateConfigChanged() to force saving GxsTrans outgoing records when updated 2017-06-05 21:15:42 +02:00
RetroPooh
2d8fd0764b stats tunnels rearranged columns for better readablilty 2017-06-05 14:25:09 +03:00
Konrad
ca1dc9d64f Changed: Unified socket path across systems. 2017-06-04 22:10:41 +02:00
csoler
318b2cb8b7 Merge pull request #870 from BabushkaRetroShare/master
Typo fixes
2017-06-04 20:38:20 +02:00
BabushkaRetroShare
7fb0419c75
Typo fixes 2017-06-04 20:34:10 +02:00
csoler
458e180622 Merge pull request #869 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-06-04 18:44:26 +02:00
csoler
1967204821 restored GXS trans cleanign delay 2017-06-04 18:43:12 +02:00