Commit Graph

8680 Commits

Author SHA1 Message Date
zeners
83ff00e77d webui: updated mithril to v0.2.3
no idea what it was before
2016-03-22 12:08:23 +01:00
zeners
51e0d83c47 webui: options / rights (only defaults) 2016-03-21 17:04:21 +01:00
zeners
1c94ff743b Merge branch 'master' 2016-03-21 16:41:21 +01:00
Cyril Soler
90347bd70e Merge pull request #315 from dartraiden/master
Fix typo
2016-03-20 12:51:30 -04:00
dartraiden
c627e1bfb7 Fix typo 2016-03-20 19:27:28 +03:00
Cyril Soler
c123761f5a Merge pull request #314 from PhenomRetroShare/Fix_CppCheckerError
Fix error reported by CppChecker:
2016-03-20 09:11:55 -04:00
Phenom
b13292bb80 Fix error reported by CppChecker:
/libretroshare/src/gxs/rsgenexchange.cc:2850: erreur : Cppcheck:
Dereferencing 'grp' after it is deallocated / released
/libretroshare/src/gxstunnel/p3gxstunnel.cc:1004: erreur : Cppcheck:
Invalid usage of output stream: '<< std::cerr'.
/libretroshare/src/util/contentvalue.cc:185: erreur : Cppcheck: Memory
leak: dest
/openpgpsdk/src/openpgpsdk/reader_armoured.c:575: erreur : Cppcheck:
Common realloc mistake: 'buf' nulled but not freed upon failure
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:103: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:122: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:141: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp:92: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp:111: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/People/PeopleDialog.cpp:774: erreur : Cppcheck:
Uninitialized variable: layout
/retroshare-gui/src/gui/People/PeopleDialog.cpp:864: erreur : Cppcheck:
Uninitialized variable: layout
/retroshare-gui/src/gui/common/AvatarWidget.cpp:225: erreur : Cppcheck:
Uninitialized variable: status
/retroshare-nogui/src/rpc/proto/rpcprotostream.cc:805: erreur :
Cppcheck: Memory leak: buffer
/supportlibs/pegmarkdown/GLibFacade.c:150: erreur : Cppcheck: va_list
'args' was opened but not closed by va_end().
/openpgpsdk/src/openpgpsdk/reader_armoured.c:575: erreur : Cppcheck:
Common realloc mistake: 'buf' nulled but not freed upon failure
/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc:213:
erreur : Cppcheck: Return value of allocation function 'init_item' is
not stored.
2016-03-20 13:12:30 +01:00
csoler
2e9d22c580 used RsTemporaryMemory to avoid memory leak in case of error in GxsTunnels 2016-03-19 18:47:59 -04:00
Cyril Soler
d1bb939344 Merge pull request #312 from PhenomRetroShare/AddPluginsPathForApple
Add Plugins Path for Apple
2016-03-19 17:14:00 -04:00
Phenom
5061046c96 Add Plugins Path for Apple
From Jenster
2016-03-19 18:58:00 +01:00
zeners
12c0efb006 webui: pgp-linked identity disabled
reason: password-request don't work
2016-03-19 17:39:46 +01:00
zeners
ecf8e7f127 Merge remote branch 'origin/master' 2016-03-19 17:39:34 +01:00
csoler
24ba909f41 fixed mixup between in/out bandwidth traffic info 2016-03-19 11:39:58 -04:00
Cyril Soler
b6e51b2d8c Merge pull request #308 from dartraiden/master
Сorrect path to Hidden Service configuration panel
2016-03-16 09:56:36 -04:00
dartraiden
5ba4f42cb9 correct path to Hidden Service configuration panel 2016-03-16 16:24:06 +03:00
zeners
1b72d2cec3 webui: unsubscribe chat-lobby 2016-03-12 23:38:39 +01:00
zeners
41a8e53abf webui: chat-layout fixed 2016-03-12 23:28:27 +01:00
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