Commit Graph

8787 Commits

Author SHA1 Message Date
electron128
20fcf635e4 Merge pull request #285 from PhenomRetroShare/Fix_SSGxsChannelGroupLoadNullError
Fix error "(EE) SSGxsChannelGroup::load() asked to load a null string.
2016-02-26 18:13:20 +01:00
csoler
9ddef9e45b merged with upstream/master 2016-02-25 17:48:59 -05:00
Phenom
1a110e4ada Define empty service string as a valid case. 2016-02-25 13:58:45 +01:00
Phenom
3c3d23bf8a Fix error "(EE) SSGxsChannelGroup::load() asked to load a null string.
Weird." by creating a default serviceString if empty.
2016-02-25 13:58:45 +01:00
csoler
0bcf52c442 added missing update of mRecvTS in database when updating a group metadata 2016-02-24 16:51:56 -05:00
defnax
d1fd5d302d update todo 2016-02-24 21:51:34 +01:00
defnax
7b1460c4c9 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-02-24 21:45:43 +01:00
csoler
f5eb791230 added notification for modified metadata in group. Does not yet work on friends though. 2016-02-23 23:04:22 -05:00
csoler
b8c42a9eb7 added copy of previous subscription flags when group update is received. Avoids unsubscribing friends when publishing an update to grp metadata 2016-02-23 23:04:22 -05:00
csoler
fafe75dca6 added update of mServerUpdateTS up to last mRecvTS of each group, which holds the last time the grp meta data was received/modified 2016-02-23 23:04:22 -05:00
Cyril Soler
a6f0b8dfc1 Merge pull request #290 from sehraf/pr-improved-unused-location-cleanup
impoved cleanup of unused locations
2016-02-22 16:57:13 -05:00
sehraf
dbdfdcd008 removed unused map lookups 2016-02-22 21:09:10 +01:00
sehraf
77166cbf13 impoved cleanup of unused locations 2016-02-22 16:41:31 +01:00
Cyril Soler
cd4d743474 added missing -lpthread 2016-02-22 10:14:29 -05:00
csoler
dcf86e6384 removed compilation warning and added warning about missing vetting for external circles 2016-02-21 12:00:09 -05:00
csoler
3446e20506 removed debug output from p3grouter.cc 2016-02-21 11:47:44 -05:00
csoler
0266b3cfa2 improved debug output in gxsnetservice.cc 2016-02-21 11:34:49 -05:00
csoler
edef6dc339 moved subscription flags when received group changes/create group to the case where the group is actually created (fixing bug causing group meta data change to unsubscribe friends) 2016-02-21 10:29:35 -05:00
electron128
1222e82fa2 fix format in readme 2016-02-21 11:23:33 +01:00
electron128
dcbd99f0ab Merge pull request #202 from electron128/fixtests
make tests compile
2016-02-21 11:20:14 +01:00
zeners
888e8f5d35 webui: lobby-chat subscribe fixed 2016-02-21 09:38:57 +01:00
zeners
7c121d7792 webui: chat: unread msg count for peer fixed 2016-02-21 09:29:09 +01:00
zeners
f29f1b21af webui: personal chat 2016-02-21 09:14:07 +01:00
csoler
09a6efad52 removed dead code in GxsSecurity 2016-02-20 21:25:21 -05:00
csoler
41a03eb331 fixed small bug causing update of TS to fail in encrypted NxsItems 2016-02-20 21:21:15 -05:00
csoler
6a4add8806 implemented per-item encryption and Vetting method compatibility layer 2016-02-20 17:53:03 -05:00
zeners
b8a8f34a48 webui: chat: sending messages 2016-02-20 19:37:31 +01:00
zeners
fdb93c3f8d webui: List forums, sort friends 2016-02-20 18:03:27 +01:00
csoler
b2a6bfbbd0 fixed one bug in debug output of encrypted key offset 2016-02-19 20:55:27 -05:00
csoler
405ecefbf8 added proper decryption calls for partial decryption and possible re-try after loading keys. 2016-02-19 20:47:50 -05:00
electron128
34957b857a libresapi: added channels/create_post
group creation acknowledge not implemented yet

usage:
$ curl --data "{\"group_id\":\"<group_id>\",\"subject\":\"just a test\",\"message\":\"test message\"}" http://<host:port>/api/v2/channels/create_post

parameter object:
{
    group_id: required string,
    subject: required string,
    message: required string,
    thumbnail_base64_png: optional string,
    files: optional array of
        {
            name: required string,
            hash: required string,
            size: required number
        }
}
2016-02-19 19:23:55 +01:00
zeners
c5f127f3b1 webui: contains => match 2016-02-19 18:48:17 +01:00
zeners
5979d2f827 Merge branch 'master' into webui 2016-02-19 18:18:15 +01:00
Cyril Soler
5a48070171 Merge pull request #281 from sehraf/pr-disc-increase-auto-clean-time
discovery: don't remove new added locations too soon
2016-02-19 10:45:18 -05:00
sehraf
4140969fcb added seperated limit for discovery (30 days) 2016-02-19 16:35:11 +01:00
csoler
0293e246a2 fixed encryption method on the basis that encrypted keys always have the same length 2016-02-18 23:38:07 -05:00
csoler
6995212a8b added code for single item encryption/decryption 2016-02-18 21:30:52 -05:00
Thunder
6695a384b0 Merge pull request #283 from PhenomRetroShare/Fix_ChatMsgItemAvatar_updateAvatar
Fix connect in ChatMsgItem for avatar updateAvatar.
2016-02-18 17:21:15 +01:00
Phenom
e639dc57ce Fix connect for avatar updateAvatar in ChatMsgItem and MessengerWindow.
As it is already connected in AvatarWidget's constructor.
2016-02-18 11:48:58 +01:00
Thunder
b059a8eb3f Merge pull request #284 from PhenomRetroShare/Fix_CannotUpdateAvatarError
Fix "(EE) cannot update avatar. mId has unhandled type." error.
2016-02-17 20:23:44 +01:00
Phenom
dc2578b528 Fix "(EE) cannot update avatar. mId has unhandled type." error.
Error was raised because event pass trought all widgets.
2016-02-17 18:18:56 +01:00
csoler
697ef4061c added test against arbitrary large items in turtle search requests. 2016-02-17 09:39:08 -05:00
csoler
51d90a4ef4 added test against arbitrary large items in turtle search requests. 2016-02-17 09:39:08 -05:00
csoler
08e4c90cc2 added single-block multiple encryption 2016-02-16 22:36:22 -05:00
Cyril Soler
c15e8b5c35 Merge pull request #282 from PhenomRetroShare/Add_MinSizeForStackPages
Add minimal Size for stackPages in MainWindow for first start.
2016-02-16 17:46:34 -05:00
Cyril Soler
d878334551 Merge pull request #206 from realityfabric/master
Added top level license file for GPL 2.0
2016-02-16 17:45:49 -05:00
Phenom
3276790bf8 Add minimal Size for stackPages in MainWindow for first start. 2016-02-16 23:15:33 +01:00
sehraf
841299d077 discovery: don't remove new added locations too soon
was: removed after 10 min. or less - when no connection is established
now: removed after 1 day - when no connection is established
2016-02-16 20:33:38 +01:00
csoler
763108f5fa debugged transport of encrypted items. Still needs work. 2016-02-15 23:24:18 -05:00
csoler
0513e71c68 fixed sending part in encrypted msg items 2016-02-14 19:42:21 -05:00