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
11,413 Commits 63 Branches 22 Tags 194 MiB
a00d2c912c
Commit Graph

4664 Commits

Author SHA1 Message Date
csoler
a00d2c912c changed lobby to char room in chat system msgs 2017-09-26 21:12:17 +02:00
csoler
cbeefda151 Merge pull request #744 from RetroPooh/tunnel-names 
transfers - add peer names for turtle routed sources
 2017-09-25 21:35:59 +02:00
csoler
5970ff239b Merge pull request #1052 from csoler/v0.6-FT 
removed delay when calling forceUpdate() on directories
 2017-09-25 21:14:30 +02:00
csoler
40cda111d2 removed delay when calling forceUpdate() on directories 2017-09-25 21:05:42 +02:00
csoler
b969f313b0 Merge pull request #1050 from csoler/v0.6-FT 
V0.6 ft
 2017-09-25 20:59:32 +02:00
csoler
d8cb3fe35a fixed not rehashing files that already exist in a different directory pointed by a symlink 2017-09-25 20:56:35 +02:00
Pooh
c47e6f620d Merge branch 'master' into tunnel-names 2017-09-25 21:43:41 +03:00
csoler
4766a8927a added an additional hard limit to directory depth, just in case 2017-09-24 23:51:47 +02:00
csoler
f497905497 fixed limitation of directory depth when indexing files 2017-09-24 23:43:52 +02:00
csoler
abd7e25a2e added checks for mMaxShareDepth and mIgnoreDuplicates 2017-09-24 18:14:45 +02:00
csoler
2a99df4d48 added UI and parameters for two new options in shared files: max share depth and ignore duplicates 2017-09-24 17:53:06 +02:00
csoler
73cbf6ca38 Merge pull request #1047 from csoler/v0.6-FT 
removed the 4M files limit on 64bits systems
 2017-09-21 23:47:11 +02:00
csoler
a2ccf97b82 removed the 4M files limit on 64bits systems 2017-09-20 22:57:32 +02:00
csoler
58ccf0bef4 Merge pull request #1045 from csoler/v0.6-FT 
adding pending transfers 100 at a time instead of 1 at a time when lo…
 2017-09-18 22:50:35 +02:00
csoler
bc2c9d576e adding pending transfers 100 at a time instead of 1 at a time when loading 2017-09-18 22:49:51 +02:00
csoler
bf7d346e8d Merge pull request #1043 from csoler/v0.6-FT 
make forceDirectoryCheck() to desactivate the pause, in case it was l…
 2017-09-17 20:27:44 +02:00
csoler
d8f621e9ec make forceDirectoryCheck() to desactivate the pause, in case it was left activated 2017-09-17 20:14:45 +02:00
Gioacchino Mazzurco
2b71a049eb Use proper initializers in p3BanList 2017-09-17 15:36:06 +02:00
Gioacchino Mazzurco
d89c151a4d Fix typo 2017-09-17 14:41:18 +02:00
csoler
8189d660c4 fixed bug causing anon FT to not resume when restarting RS when the server enforces encryption 2017-09-16 22:13:15 +02:00
Phenom
a0ebddb4eb Fic Gcc warnings: 
/libretroshare/src/file_sharing/p3filelists.cc👎 In static member
function ‘static bool p3FileDatabase::convertPointerToEntryIndex(const
void*, p3FileDatabase::EntryIndex&, uint32_t&)’:
/libretroshare/src/file_sharing/p3filelists.cc:624: warning:
dereferencing type-punned pointer will break strict-aliasing rules [-
Wstrict-aliasing]
     e   = EntryIndex(  *reinterpret_cast<uint32_t*>(&p) &
ENTRY_INDEX_BIT_MASK ) ;
/home/phenom/GIT/RetroShare/trunk/libretroshare/src/file_sharing/
p3filelists.cc:625: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]
     friend_index = (*reinterpret_cast<uint32_t*>(&p)) >>
NB_ENTRY_INDEX_BITS ;

/libretroshare/src/gxstrans/p3gxstransitems.h:29: In file included from
../../../trunk/libretroshare/src/gxstrans/p3gxstransitems.h:29:0,
/libretroshare/src/gxstrans/p3gxstransitems.cc:19: from ../../../trunk/
libretroshare/src/gxstrans/p3gxstransitems.cc:19:
/libretroshare/src/gxstrans/p3gxstransitems.cc👎 In member function
‘virtual void
OutgoingRecord_deprecated::serial_process(RsGenericSerializer::SerializeJob,
RsGenericSerializer::SerializeContext&)’:
/libretroshare/src/serialiser/rstypeserializer.h:61: warning:
dereferencing type-punned pointer will break strict-aliasing rules [-
Wstrict-aliasing]
  RsTypeSerializer::serial_process<T>(j, ctx, reinterpret_cast<T&>(I),
#I);\

/libretroshare/src/gxstrans/p3gxstransitems.cc:51: in expansion of macro
‘RS_REGISTER_SERIAL_MEMBER_TYPED’
  RS_REGISTER_SERIAL_MEMBER_TYPED(clientService, uint16_t);
/libretroshare/src/gxstrans/p3gxstransitems.cc👎 In member function
‘virtual void
OutgoingRecord::serial_process(RsGenericSerializer::SerializeJob,
RsGenericSerializer::SerializeContext&)’:
/libretroshare/src/serialiser/rstypeserializer.h:61: warning:
dereferencing type-punned pointer will break strict-aliasing rules [-
Wstrict-aliasing]
  RsTypeSerializer::serial_process<T>(j, ctx, reinterpret_cast<T&>(I),
#I);\

/libretroshare/src/gxstrans/p3gxstransitems.cc:65: in expansion of macro
‘RS_REGISTER_SERIAL_MEMBER_TYPED’
  RS_REGISTER_SERIAL_MEMBER_TYPED(clientService, uint16_t);
/retroshare-gui/src/gui/common/RsBanListToolButton.cpp👎 In member
function ‘void RsBanListToolButton::applyIp()’:
/retroshare-gui/src/gui/common/RsBanListToolButton.cpp:163: warning:
‘list_type’ may be used uninitialized in this function [-Wmaybe-
uninitialized]
   changed = rsBanList->removeIpRange(addr, masked_bytes, list_type);
 2017-09-13 18:37:32 +02:00
Phenom
8884a324bb Fix Uninitilized Peer Max Rates. 
When called by /libretroshare/src/pqi/pqihandler.cc:140
 2017-09-12 17:18:41 +02:00
Phenom
cf908674ce Fix unitialized value in LocalDirectoryUpdater. 2017-09-11 21:51:14 +02:00
csoler
551ef63c6e added default ignore list on linux 2017-09-11 19:36:06 +02:00
csoler
0ca0b72a5a moved file ignore test to a more appropriate place 2017-09-11 19:02:07 +02:00
csoler
eff5c5d6ee added pause to file hashing 2017-09-10 22:07:36 +02:00
csoler
ea25d4b5a4 improved update of ignore list 2017-09-10 20:22:17 +02:00
csoler
884b3a6220 added infrastructure to add a ignore list in shared files 2017-09-10 19:58:57 +02:00
csoler
160ab7b4f3 added missing code for remote search by hash, fixing the bug of direct sources not added 2017-09-03 23:32:48 +02:00
csoler
8d146038c2 fixed bug preventing search by hash to be called on own files 2017-09-03 22:52:31 +02:00
Gioacchino Mazzurco
32f43b999e Merge branch 'GSoC2017-evaluation-final' 2017-08-18 01:39:31 +02:00
Phenom
5a1c316fc6 Fix Travis MacOs Compilation 2017-08-12 11:49:33 +02:00
thunder2
3ae85dbc6f Fixed version number in rsversion.in 2017-08-06 14:10:23 +02:00
thunder2
52dbd91f3b Removed Windows specific hack to get commandline arguments. 2017-08-05 14:23:35 +02:00
csoler
3e25d96daa fixed unix -> linux-* target in .pri, as qt4 doesnt seem to recognise unix 2017-08-04 21:38:44 +02:00
csoler
11832e34f8 updated version number 2017-08-03 22:51:40 +02:00
csoler
4e02c5f262 Merge pull request #979 from PhenomRetroShare/Fix_LobbyAutoSubscribe 
Fix Lobby auto-subscribe.
 2017-08-03 21:29:52 +02:00
csoler
4b820a055c Merge pull request #981 from csoler/v0.6.3 
removed newline that comes with debug info
 2017-08-03 21:08:54 +02:00
csoler
84b32f060e removed newline that comes with debug info 2017-08-03 20:09:48 +02:00
Phenom
27bedf8414 Fix Lobby auto-subscribe. 
Don't remove auto-subscribe if we cannot get gxsId detail.
But what happens if the id is removed?
 2017-08-01 10:16:42 +02:00
csoler
7d5f60185b Merge pull request #978 from G10h4ck/cxx11_comp 
Introduce C++11 compatibility macro for gcc < 4.6
 2017-07-31 19:22:15 +02:00
Gioacchino Mazzurco
541b1ea498 Introduce C++11 compatibility macro for gcc < 4.6 2017-07-31 18:26:51 +02:00
csoler
2588068775 Merge pull request #953 from PhenomRetroShare/Fix_NewWindowForPassword 
Fix Ask Password in new window if wrong in StartDialog.
 2017-07-30 21:29:14 +02:00
csoler
a2f8b5e6e9 Merge pull request #972 from csoler/v0.6.3 
V0.6.3
 2017-07-30 14:42:28 +02:00
csoler
e82b6fc1fe improved GenCertDialog with small indicator text, and hide location by default 2017-07-30 14:31:52 +02:00
Phenom
5dc25e37f7 Fix Ask Password in new window if wrong in StartDialog. 
And Fix LineEditClear to show placeholder test even if it has focus
(Like Qt5).
 2017-07-30 14:11:34 +02:00
csoler
09faa60005 Merge pull request #967 from csoler/v0.6.3 
V0.6.3
 2017-07-29 23:16:47 +02:00
csoler
e8415c4f03 made RS not to ask for plugin confirmation on first load 2017-07-29 23:12:56 +02:00
csoler
a16220e53e switched to RC2 2017-07-29 20:24:31 +02:00
csoler
e861f87364 removed unused msg item class that caused aliasing warnings (serialisation of time_t as uint32_t) 2017-07-26 21:44:24 +02:00