Commit Graph

11377 Commits

Author SHA1 Message Date
Gioacchino
195127f43c Merge pull request #965 from PhenomRetroShare/Fix_GccWarning
Fic Gcc warnings:
2017-09-15 16:23:38 +02:00
Gioacchino
6ad2306335 Merge pull request #1039 from PhenomRetroShare/Fix_WinCompil
Fix Windows Build
2017-09-15 16:19:48 +02:00
Phenom
f4166860e8 Fix Windows Build 2017-09-15 15:04:43 +02:00
Gioacchino Mazzurco
62eefa4fed Remove cruft from PeersHandler::handleGetInactiveUsers
Move documentaion to header
2017-09-15 09:33:01 +02:00
Gioacchino Mazzurco
341c94ee6c PeersHandler::handleRemoveNode only remove location
Move documentation in header
2017-09-15 09:03:50 +02:00
Gioacchino Mazzurco
7888ec617a Remove extra cruft 2017-09-15 08:56:54 +02:00
Gioacchino Mazzurco
016cafdd23 Merge branch 'master' of https://github.com/myfingerhurt/RetroShare into myfingerhurt-webui-PR1014 2017-09-15 08:25:30 +02:00
csoler
331cdd0a14 Merge pull request #1031 from PhenomRetroShare/Fix_UninitializedStatusInPeersHandler
Fix Uninitialized Status in PeersHandler
2017-09-14 22:10:25 +02:00
csoler
d5eac2c1d9 Merge pull request #1033 from PhenomRetroShare/Add_UploadExpColAll
Add Expand/Collapse All in Upload List
2017-09-14 22:06:01 +02:00
csoler
d7dae0ef35 Merge pull request #1034 from csoler/v0.6-FT
V0.6 ft
2017-09-14 22:02:39 +02:00
csoler
1d231e6db9 fixed bug causing file lists to not refresh/show until a friend makes a change 2017-09-14 22:01:52 +02:00
csoler
5511a0b2b0 added tooltip for file ignore list 2017-09-14 21:28:34 +02:00
Phenom
dff0d50b92 Add Expand/Collapse All in Upload List
And don't make child item if only one peer.
2017-09-14 19:22:37 +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
csoler
4b1161dc0b updated changelog 2017-09-12 21:03:44 +02:00
Phenom
d23e860413 Fix Uninitialized Status in PeersHandler 2017-09-12 17:59:32 +02:00
csoler
762d0258ed Merge pull request #1027 from PhenomRetroShare/Fix_UninitializedPeerMaxRates
Fix Uninitilized Peer Max Rates.
2017-09-12 17:40:54 +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
ben
f348558077 Add a checker which prevents of adding your own gpg_id.
Add an inactive friends list based on last seen Unix timestamp.
Add a method of removing a specific peer based on peer_id.

As fas as I know, the same pgp_id will discorvery themself and add online subnodes automaticlly even you remove one of them their just keep coming back, but if you accidently add your own peer_id on the WebUI, the peer list will show two identical PGP names and its subnodes, untill the retroshare gets restarted.

And this modification don't add the same peer_id as long as it belongs to your current node, it doesn't mean you can't add your new nodes with the same pgp_id but different peer_id.

Honor the Allman indent style
2017-09-12 17:01:25 +09:00
csoler
66bf1884a8 Merge pull request #1029 from PhenomRetroShare/Fix_UninitValueInLocalDirUpd
Fix unitialized value in LocalDirectoryUpdater.
2017-09-11 22:20:27 +02:00
Phenom
cf908674ce Fix unitialized value in LocalDirectoryUpdater. 2017-09-11 21:51:14 +02:00
csoler
3b7809a408 Merge pull request #1028 from csoler/v0.6-FT
added default ignore list on linux
2017-09-11 20:49:11 +02:00
csoler
551ef63c6e added default ignore list on linux 2017-09-11 19:36:06 +02:00
csoler
c5f91e3b6b Merge pull request #1026 from csoler/v0.6-FT
V0.6 ft
2017-09-11 19:05:19 +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
b3e1597d6b Merge pull request #1025 from Ppjet6/master
Typo in GenCertDialog
2017-09-09 18:34:25 +02:00
Maxime Buquet
c85664e6e4 Typo in GenCertDialog 2017-09-09 13:54:30 +01:00
csoler
1e2a2275f4 Merge pull request #1023 from Ppjet6/master
Typo in GenCertDialog
2017-09-09 14:48:35 +02:00
csoler
1bc9ef6f62 Merge pull request #1022 from PhenomRetroShare/Fix_MoveSharedFilesDialog
Move SharedFilesDialog to /gui/FileTransfer/
2017-09-09 14:48:02 +02:00
Maxime Buquet
64d0290e44 Typo in GenCertDialog 2017-09-09 03:48:18 +01:00
Phenom
4336a4ad46 Move SharedFilesDialog to /gui/FileTransfer/
And remove old DEFINE because very olds files are deleted.
2017-09-07 19:53:51 +02:00
csoler
54ee6509d1 Merge pull request #1021 from PhenomRetroShare/Fix_ProgressSorting
Fix File Transfert Progress Sorting.
2017-09-07 18:54:04 +02:00
Phenom
d81f9a351e Fix File Transfert Progress Sorting. 2017-09-07 18:16:07 +02:00
csoler
1dc6bef985 Merge pull request #1019 from PhenomRetroShare/Add_GroupedUpLoadItem
Regroup Upload Items by file in TransfersDialog.
2017-09-07 18:08:34 +02:00
Phenom
3b4e84c6d4 Regroup Upload Items by file in TransfersDialog. 2017-09-07 17:08:05 +02:00
csoler
f9102e5964 Merge pull request #1001 from PhenomRetroShare/Add_OnlyHiddenNodeCF
Add Only Hidden Node configure flag
2017-09-05 20:59:16 +02:00
csoler
9ceba80fcb Merge pull request #1015 from PhenomRetroShare/Fix_TravisCI_MacOS
Fix Travis CI build for MacOS
2017-09-05 20:46:33 +02:00
csoler
671b418c81 Merge pull request #1008 from PhenomRetroShare/Add_FilterInDownloadList
Add a filter to DownLoad list
2017-09-05 20:46:05 +02:00
Phenom
32888f0819 Fix Travis CI build for MacOS
OpenCV move from homebrew/science/ to trunk.
2017-09-05 16:19:10 +02:00
csoler
bc6ea65d75 Merge pull request #1000 from PhenomRetroShare/Fix_RemovePngPng
Remove *.png.png duplicated Files
2017-09-04 16:52:59 +02:00
csoler
c6ffe07cd1 Merge pull request #1009 from csoler/v0.6-FT
V0.6 ft
2017-09-04 16:48:17 +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
csoler
063783a859 Merge pull request #1004 from digitigrafo/master
Orange skin webUI proposed
2017-09-03 14:59:14 +02:00
Phenom
a73ea437ed Add a filter to DownLoad list 2017-09-02 17:57:04 +02:00
cri
e1e1fb4189 revert build orange skin 2017-08-24 15:31:17 +02:00
cri
4fc91be217 rwd style 2017-08-24 15:08:29 +02:00