Commit Graph

11614 Commits

Author SHA1 Message Date
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
932eb49f0c Merge pull request #1049 from Steve-V/minor-spelling-fix
spelling fix ommitted -> omitted
2017-09-23 13:49:53 +02:00
Steve-V
82c9c95fc5 spelling fix ommitted -> omitted 2017-09-22 19:58:13 -05: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
defnax
308f8ca57a update qrc file 2017-09-19 18:34:58 +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
defnax
52ca6d058b Added Crystall Ball to emote file 2017-09-18 20:49:40 +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
e21dec47f1 Merge pull request #1038 from PhenomRetroShare/Add_UploadUserColumn
Add Peer Column in Upload list
2017-09-17 20:26:46 +02:00
csoler
d8f621e9ec make forceDirectoryCheck() to desactivate the pause, in case it was left activated 2017-09-17 20:14:45 +02:00
csoler
c2f321d77c updated changelog 2017-09-17 18:51:06 +02:00
csoler
3a85861472 updated ubuntu packagign script 2017-09-17 18:51:06 +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
f3c627dceb Merge pull request #1042 from csoler/v0.6-FT
fixed bug causing anon FT to not resume when restarting RS when the s…
2017-09-16 22:13:53 +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
b13d985e58 Add Icon in Peer name in DL/UL List
And don't show upload item if no peer.
2017-09-16 19:29:10 +02:00
Phenom
d9298dcf49 Add Peer Column in Upload list 2017-09-16 19:29:10 +02:00
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
Angela Mazzurco
3530353678 Merge branch 'qml_app_ui_improvements' into qml_app_development 2017-09-11 17:03:19 +02:00
Angela Mazzurco
44ffdb97c5 Refactor and delete repeated code 2017-09-11 17:01:34 +02:00
Angela Mazzurco
be7c6a966f Refactor function name 2017-09-11 16:43:38 +02:00
Angela Mazzurco
4642f2ab2a Clean code 2017-09-11 16:42:29 +02:00
Angela Mazzurco
cd2e18f27b Use correct image size 2017-09-11 16:36:59 +02:00