Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-14 10:24:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,584 Commits 63 Branches 22 Tags 195 MiB
6e1de5b5ed
Commit Graph

12584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thunder2
6e1de5b5ed Fixed Windows compile with MinGW 2018-10-14 15:28:20 +02:00
csoler
fae02741d4
Merge pull request #1370 from sehraf/pr_remove-debug-output 
remove debug output
 2018-10-14 15:00:09 +02:00
csoler
bbf855fefb
Merge pull request #1371 from csoler/v0.6-BugFixing 
fixed bug in recent commit that broke turtle generic search
 2018-10-13 23:00:29 +02:00
csoler
74022a5e10
fixed bug in recent commit that broke turtle generic search 2018-10-13 22:59:26 +02:00
csoler
9c90b32def
fixed dangerous memcpy in RsTurtleGenericSearchResultItem::clone() function 2018-10-12 22:19:07 +02:00
sehraf
e6febe0297
remove debug output 2018-10-12 18:20:55 +02:00
csoler
18eee374f1
Merge pull request #1361 from sehraf/pr_jsonfy-rsMsg 
[jsonapi] add most remaining functions of rsMsg
 2018-10-10 22:04:32 +02:00
csoler
09b109d522
Merge pull request #1364 from G10h4ck/safer_time 
Use safer rstime_t instead of time_t
 2018-10-10 22:03:51 +02:00
Gioacchino Mazzurco
a47eec14e4
Print a warning if deserialized rstime_t is negative 2018-10-10 21:54:50 +02:00
Gioacchino Mazzurco
a89c29030a
Add missing rstime include in jsonapi 2018-10-08 11:56:47 +02:00
G10h4ck
b8af13f0b7
Merge pull request #3 from hunbernd/fix/win64 
Fix building error about losing precision on Win x64
 2018-10-07 22:29:42 +02:00
hunbernd
b7d5944b9c Fix building error about losing precision on Win x64 2018-10-07 21:53:16 +02:00
Gioacchino Mazzurco
6db23267c3
retroshare-gui fix windows compilation error due to time_t usage 2018-10-07 15:51:02 +02:00
Gioacchino Mazzurco
72d8364370
libresapi fix compile error on windows due to time_t usage 2018-10-07 14:41:14 +02:00
Gioacchino Mazzurco
ddf3164545
Fix ctime(&rstime_t) error on windows 
rstime_t not neccesary in those cases so use plain time_t instead
 2018-10-07 14:41:13 +02:00
Gioacchino Mazzurco
77d938bf52
Remove _USE_32BIT_TIME_T windows define 
Why did we added it in first place?
 2018-10-07 13:07:22 +02:00
Gioacchino Mazzurco
329050a9c2
Use safer rstime_t instead of time_t 
Avoid problems to serialization on different platforms, without breaking
nested STL containers serialization.

The conversion have been made with sed, and checked with grep, plus
kdiff3 visual ispection, plus rutime tests, so it should be fine.
 2018-10-07 13:07:06 +02:00
sehraf
137bd9cd6d
jsonapi: fix nested std types 2018-10-06 23:50:29 +02:00
csoler
586cff2ad1
Merge pull request #1362 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2018-10-06 18:33:13 +02:00
csoler
045691855b
Merge pull request #1356 from PhenomRetroShare/Fix_Warnings 
Fix warnings
 2018-10-06 18:31:33 +02:00
G10h4ck
41aa675a9b
Avoid travis breakage due to outdated qt55 depend 2018-10-06 02:41:35 +02:00
csoler
ec8e8ebafa
fixed merging with upstream/master 2018-10-05 21:38:36 +02:00
csoler
dbd52c0c9c
fixed bug in previous commit 2018-10-05 17:01:54 +02:00
csoler
4de0498208
fixed bad signature checking code for config files 2018-10-05 16:54:36 +02:00
sehraf
6dabb81dc0
rsMsg: unify parameter name 2018-10-04 23:25:23 +02:00
sehraf
500eb7f518
jsonapi: add rsMsg tagging functions 2018-10-04 23:24:06 +02:00
sehraf
897c8e0a8a
jsonapi: more rsMsg functions 2018-10-04 22:43:13 +02:00
sehraf
70678ad508
jsonapi: fix std::map<T,U> 2018-10-04 22:43:13 +02:00
sehraf
150af40e09
jsonapi: convert and add getMessageCount 2018-10-04 22:43:12 +02:00
sehraf
285158db5f
jsonapi: access messages (mail) 2018-10-04 22:43:12 +02:00
csoler
c6d0203557
added debug output to see which config files are loaded/saved 2018-10-04 19:22:49 +02:00
csoler
fb21e427be
removed saving of GxsTrans configuration in class destructor, causing lock up when quitting RS 2018-10-04 19:14:21 +02:00
csoler
6c4d1c34e3
fixed removal of "share on channel"/"share on forum" menu entries in own files 2018-10-04 18:50:11 +02:00
csoler
9c493453cc
Merge pull request #1358 from csoler/v0.6-ImprovedGUI 
select GxsIds as default list to chose msg destination from
 2018-10-03 15:28:37 +02:00
csoler
81fc3b7921
select GxsIds as default list to chose msg destination from 2018-10-03 15:25:53 +02:00
csoler
64f1d78670
Merge pull request #1357 from csoler/v0.6-ImprovedGUI 
when replying to a msg, always select an ID to author the msg that wa…
 2018-10-03 15:07:50 +02:00
csoler
83a987936d
when replying to a msg, always select an ID to author the msg that was in the destination list 2018-10-03 15:02:37 +02:00
Phenom
d401fdfb40 Fix Gcc Warning: 
/libresapi/src/api/RsControlModule.cpp:588: warning: no return statement
in function returning non-void [-Wreturn-type]
 2018-09-30 15:10:40 +02:00
Phenom
6ef72f551d Fix Gcc Warning in authssl.cc 
/libretroshare/src/pqi/authssl.cc:160: warning: ‘void
dyn_destroy_function(CRYPTO_dynlock_value*, const char*, int)’ defined
but not used [-Wunused-function]
 static void dyn_destroy_function(struct CRYPTO_dynlock_value *l, const
char */*file*/, int /*line*/)
/libretroshare/src/pqi/authssl.cc:143: warning: ‘void
dyn_lock_function(int, CRYPTO_dynlock_value*, const char*, int)’ defined
but not used [-Wunused-function]
 static void dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l,
const char */*file*/, int /*line*/)
/libretroshare/src/pqi/authssl.cc:121: warning: ‘CRYPTO_dynlock_value*
dyn_create_function(const char*, int)’ defined but not used [-Wunused-
function]
 static struct CRYPTO_dynlock_value *dyn_create_function(const char */
*file*/, int /*line*/)
/libretroshare/src/pqi/authssl.cc:106: warning: ‘long unsigned int
id_function()’ defined but not used [-Wunused-function]
 static unsigned long id_function(void)
/libretroshare/src/pqi/authssl.cc:92: warning: ‘void
locking_function(int, int, const char*, int)’ defined but not used [-
Wunused-function]
 static void locking_function(int mode, int n, const char */*file*/, int
/*line*/)
 2018-09-30 15:10:40 +02:00
Phenom
1839d23df1 Fix Gcc Warning hashstream.h 
/libretroshare/src/crypto/hashstream.cc:38: warning: friend declaration
‘template<class T> librs::crypto::HashStream&
librs::crypto::operator<<(librs::crypto::HashStream&, const T&)’ is not
visible to explicit specialization
  HashStream& operator<<(HashStream& u,const std::string& s)
/libretroshare/src/crypto/hashstream.cc:44: warning: friend declaration
‘template<class T> librs::crypto::HashStream&
librs::crypto::operator<<(librs::crypto::HashStream&, const T&)’ is not
visible to explicit specialization
  HashStream& operator<<(HashStream& u,const uint64_t& n)
/libretroshare/src/crypto/hashstream.cc:58: warning: friend declaration
‘template<class T> librs::crypto::HashStream&
librs::crypto::operator<<(librs::crypto::HashStream&, const T&)’ is not
visible to explicit specialization
  HashStream& operator<<(HashStream& u,const uint32_t& n)
/libretroshare/src/crypto/hashstream.cc:72: warning: friend declaration
‘template<class T> librs::crypto::HashStream&
librs::crypto::operator<<(librs::crypto::HashStream&, const T&)’ is not
visible to explicit specialization
  HashStream& operator<<(HashStream& u,const uint8_t& n)
 2018-09-30 15:10:40 +02:00
csoler
79a8b2183f
Merge pull request #1353 from csoler/v0.6-FileLists 
V0.6 file lists
 2018-09-30 13:31:26 +02:00
csoler
3d0ad54f12
Merge pull request #1352 from PhenomRetroShare/Fix_Warnings 
Fix warnings
 2018-09-29 20:33:32 +02:00
csoler
0ef47e25c6
Merge pull request #1355 from Josep-San/GUI_Upload_Header_Context-Menu 
Added context menu for Upload list headers to hide/show columns.
 2018-09-29 20:30:31 +02:00
csoler
443dbdfbef
fixed small bug breaking display of flat mode in files 2018-09-29 19:04:23 +02:00
Josep-San
4578b4403a Added context menu for Upload list headers to hide/show columns. 2018-09-28 15:38:39 +02:00
csoler
752275f813
fixed various display bugs in extra file list 2018-09-27 22:14:00 +02:00
csoler
54ec49dc03
make extra shared file list appear only when non empty 2018-09-27 21:56:41 +02:00
csoler
e1698429de
fixed display of size 2018-09-27 21:46:00 +02:00
csoler
2610f62e41
fixed display of temporary shared file text 2018-09-27 21:42:21 +02:00
csoler
c77a28c17a
added proper notification when removing an extra file 2018-09-27 21:20:06 +02:00