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
8,663 Commits 63 Branches 22 Tags 194 MiB
0afa2e3726
Commit Graph

8663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zeners
0afa2e3726 webui: unread chat message counter in menu 2016-03-12 20:20:56 +01:00
zeners
e9af1794dd webui: need for master 2016-03-12 19:17:37 +01:00
zeners
b1286f06ed webui: route peer location to chat-lobby 2016-03-12 17:44:43 +01:00
zeners
b1da4ed67e Merge branch 'master' 2016-03-12 16:46:33 +01:00
csoler
5d2833fa42 improved one line of debug output in turtle 2016-03-12 09:25:28 -05:00
csoler
670fb3d1eb merged 2016-03-12 09:25:00 -05:00
Cyril Soler
4e2fd4e2c7 Merge pull request #303 from PhenomRetroShare/Fix_CorrectColoredNameContrast 
Correct Colored Name Contrast in chat, same way than text.
 2016-03-12 09:22:28 -05:00
Phenom
16c59af9f4 Correct Colored Name Contrast in chat, same way than text. 2016-03-12 13:25:10 +01:00
csoler
b97c5df581 fixed culumn name in GR stats 2016-03-11 17:47:12 -05:00
csoler
692b549f08 fixing compilation problem 2016-03-11 17:27:40 -05:00
csoler
232dba28ea allow non signature checking for GR message recepts at intermediate peers when key is missing. Should fix return receipt being lost in the way keeping messages in outbox 2016-03-11 17:21:27 -05:00
Cyril Soler
ecebaced23 Merge pull request #301 from PhenomRetroShare/Add_NewColumnInRsCollForPath 
Add a new column in RsColl Editor to get only name in first one.
 2016-03-11 14:26:27 -05:00
Cyril Soler
c0cf05cbb8 Merge pull request #302 from PhenomRetroShare/Fix_RsLinkCopyForExtraFile 
Fix Paste RetroShare Link action when copy File link.
 2016-03-11 14:25:18 -05:00
Phenom
d62a20547d Fix Paste RetroShare Link action when copy File link. 2016-03-11 20:08:28 +01:00
Phenom
7e76e28af7 Add a new column in RsColl Editor to get only name in first one. 2016-03-11 17:26:18 +01:00
csoler
0282c2aeb3 added ban menu entry to chat lobby participant list 2016-03-09 21:49:24 -05:00
csoler
49605a33dc fixed variable scope problem in introserver.cc 2016-03-07 22:10:18 -05:00
csoler
ecf4a991c0 updated ubuntu changelog 2016-03-06 20:26:46 -05:00
csoler
bb260696ce attempt at fixing negative bw rates in GUI that may pop up when an error is present in the SSL stream (e.g. when a peer disconnects/reconnects) 2016-03-02 19:00:51 -05:00
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
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
3446e20506 removed debug output from p3grouter.cc 2016-02-21 11:47:44 -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
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
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
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