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,636 Commits 63 Branches 22 Tags 194 MiB
1f207ba05c
Commit Graph

5893 Commits

Author SHA1 Message Date
csoler
ead8cb2901 Merge pull request #1076 from RetroPooh/chatsearchbut 
fix chat search button position
 2017-10-23 21:13:56 +02:00
csoler
e441caec49 Merge pull request #1074 from RetroPooh/sett-nodiscocb 
removed show discovery checkbox from network options, it is in appear…
 2017-10-23 21:11:08 +02:00
csoler
b2750392f2 Merge pull request #1073 from RetroPooh/hid1 
disable nat/dht indicators for hidden mode, hide irrelevant network o…
 2017-10-23 21:09:54 +02:00
csoler
1d7d53a95a Merge pull request #1070 from RetroPooh/posted-descr 
fix descriptions display in Posted
 2017-10-23 21:07:23 +02:00
RetroPooh
e2bbbad590 fix checkboxes state for already accepted/signed keys on add friend dialog 2017-10-23 20:01:35 +03:00
hunbernd
64481de74b Set the proper size limits 2017-10-23 17:04:20 +02:00
RetroPooh
b968974bc6 fix chat search button position 2017-10-23 17:51:39 +03:00
hunbernd
f434e6559b Use binary search to find the right file size 2017-10-23 15:31:18 +02:00
hunbernd
c17a8e7d51 Optimalizations 2017-10-23 15:31:18 +02:00
hunbernd
af4817378c Convert image into 4 bit color table format 2017-10-23 15:31:17 +02:00
hunbernd
9af2730879 Downscale image automatically 2017-10-23 15:31:17 +02:00
RetroPooh
4a1ddccd8e removed show discovery checkbox from network options, it is in appearance now 2017-10-23 12:24:56 +03:00
Pooh
4594c1ae9c Update MainWindow.cpp 2017-10-23 11:51:22 +03:00
Pooh
1cc65066dd Update ServerPage.cpp 2017-10-23 11:49:05 +03:00
Pooh
a0f6a741b1 Merge branch 'master' into hid1 2017-10-23 11:46:39 +03:00
RetroPooh
78037a66be disable nat/dht indicators for hidden mode, hide irrelevant network options elements 2017-10-23 11:42:03 +03:00
csoler
0359795cae fixed regression preventing context menu to open in destination directory for RsCollection 2017-10-22 20:08:22 +02:00
csoler
01c82c3eb7 Merge pull request #1072 from hunbernd/fix/html-in-forum-title 
Part of the forum title is not displayed when it is enclosed in < >
 2017-10-22 20:02:27 +02:00
hunbernd
0c39b5c021 Fix bug causing RS to crash at startup when some icons were removed from toolbar 
For example: disabled plugins
 2017-10-22 19:44:14 +02:00
hunbernd
4e16042b75 Part of the forum title is not displayed when it is enclosed in < > 2017-10-22 19:11:52 +02:00
RetroPooh
723016e930 fix descriptions display in Posted 2017-10-22 19:39:44 +03:00
csoler
6a0ccc4444 added means to select download directory in RsCollectionDialog 2017-10-22 18:28:36 +02:00
csoler
ee2120a5bc fixed bug causing FileTree links to open empty 2017-10-22 17:36:19 +02:00
csoler
f50351063d Merge pull request #1069 from RetroPooh/postbuttonlabels 
add text labels to post buttons in forums and channels; fix version s…
 2017-10-22 16:00:08 +02:00
csoler
34eb971f5b Merge pull request #1068 from RetroPooh/winsize 
add windows size/pos saving
 2017-10-22 15:57:24 +02:00
RetroPooh
749a34d815 add text labels to post buttons in forums and channels; fix version selector placement 2017-10-22 15:55:08 +03:00
RetroPooh
b48916ca46 add windows size/pos saving 2017-10-22 13:49:38 +03:00
Phenom
ef13e03e5a Fix SecurityIpItem isSame 2017-10-22 11:52:21 +02:00
csoler
b6aeacbed4 fixed share on channel code 2017-10-21 23:48:27 +02:00
csoler
770add8b8a added code to share a file/dir on channel 2017-10-21 21:23:40 +02:00
csoler
cbcf402e0b setup proper title in RsCollectionEditor when in download mode 2017-10-21 17:42:17 +02:00
csoler
2cfa86620c merge of trees and single files before paste in DL queue so that all use the CollectionEditor 2017-10-21 17:35:06 +02:00
csoler
fe516c6b7a fixed pasting of FileTree links in download queue 2017-10-21 16:16:23 +02:00
csoler
6581fa0429 code cleaning 2017-10-21 15:44:45 +02:00
csoler
0fbcf0148c code cleaning. Removed comments at end of conditional 2017-10-19 22:20:23 +02:00
csoler
74d5069225 renamed RsCollectionEditor into RsCollection. Added download of FileTree links 2017-10-19 22:14:04 +02:00
csoler
32be00614d various improvements to collection links 2017-10-19 10:19:56 +02:00
csoler
9206daca37 fixed up collection link display 2017-10-18 23:20:19 +02:00
csoler
e1d5014288 added copy links from file hierarchy 2017-10-18 22:32:15 +02:00
csoler
847c1b2bce renamed RsCollectionFile into RsCollectionEditor 2017-10-17 22:39:05 +02:00
csoler
68763f58d1 added links machinery to handle file hierarchies 2017-10-17 22:38:42 +02:00
Phenom
e63217e7de Fix OpMode Restore 2017-10-17 15:39:38 +02:00
csoler
22942dc70b fixed bug causing suffix/prefix lists to contain an empty string 2017-10-01 20:20:26 +02:00
csoler
bc05aaa9d9 switched tokenQueue speed to 10 calls/sec, thus improving loading speeds. Still need to test for CPU load 2017-09-30 18:58:31 +02:00
felisucoibi
06063c525e removed extra space 2017-09-30 11:34:18 +02:00
felisucoibi
b84c8983c4 Removed ... from text 2017-09-30 00:29:07 +02:00
felisucoibi
ef6fd38696 Changed prefixes and sifixes for startign with and ending with to be understandable. 
On internet software uses starting with and ending with instead of prefixes and sufixes, in literature is ok even in internet sometimes, but when you search for files or filter files you use the filter starting with and ending with, is not prefixes is wrong but less understandable in internet language talking about files.
 2017-09-28 22:42:30 +02:00
csoler
e66c0d1349 removed updateTotals() method. Replaced it with costless on-the-fly update of totals 2017-09-27 22:26:14 +02:00
csoler
a00d2c912c changed lobby to char room in chat system msgs 2017-09-26 21:12:17 +02:00
csoler
8eae3744dc Merge pull request #1053 from csoler/v0.6-FT 
fixd broken layout
 2017-09-25 22:14:34 +02:00
csoler
0d9b6e7c8c fixd broken layout 2017-09-25 22:09:35 +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
Pooh
f98f16fb15 Update TransfersDialog.cpp 2017-09-25 22:31:49 +03:00
csoler
b969f313b0 Merge pull request #1050 from csoler/v0.6-FT 
V0.6 ft
 2017-09-25 20:59:32 +02:00
Pooh
72dc1c7da4 Update TransfersDialog.cpp 2017-09-25 21:50:12 +03: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
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
Steve-V
82c9c95fc5 spelling fix ommitted -> omitted 2017-09-22 19:58:13 -05:00
defnax
308f8ca57a update qrc file 2017-09-19 18:34:58 +02:00
defnax
52ca6d058b Added Crystall Ball to emote file 2017-09-18 20:49:40 +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
Pooh
7144b72c31 Update SearchDialog.cpp 2017-09-15 17:27:44 +03:00
Gioacchino
195127f43c Merge pull request #965 from PhenomRetroShare/Fix_GccWarning 
Fic Gcc warnings:
 2017-09-15 16:23:38 +02:00
RetroPooh
ecee1e645c allow multiple filenames display for a single hash in search 2017-09-15 17:09:34 +03: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
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
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
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
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
Phenom
d81f9a351e Fix File Transfert Progress Sorting. 2017-09-07 18:16:07 +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
Phenom
a73ea437ed Add a filter to DownLoad list 2017-09-02 17:57:04 +02:00
Phenom
5d59d56ba2 Add Only Hidden Node configure flag 
To have only hidden node generation append the following assignation to
qmake command line "CONFIG+=rs_onlyhiddennode"
 2017-08-20 13:17:28 +02:00
csoler
106f03d42b Merge pull request #993 from PhenomRetroShare/Fix_OpenMessageForAllFile 
Add "No to All" for RSLink Open message.
 2017-08-16 22:26:48 +02:00
csoler
526d8e7b52 Merge pull request #990 from PhenomRetroShare/Fix_RelaySettingLayoutMargin 
Fix Relay Setting Layout Margin
 2017-08-16 22:26:13 +02:00
Phenom
041447b2d7 Add "No to All" for RSLink Open message. 2017-08-12 15:16:07 +02:00
Phenom
6b2bc7d84b Fix From text in Mail 
Missing lines in Change RetroShareLink creation methodes as static
 2017-08-12 14:13:10 +02:00
Phenom
55bb105462 Fix Relay Setting Layout Margin 2017-08-12 11:21:14 +02:00
csoler
a041584598 Merge pull request #976 from csoler/v0.6.3 
reduced size of GenCertDialog window (guess) and fixed username
 2017-07-31 01:10:35 +02:00
csoler
7ad0ec1a5c reduced size of GenCertDialog window (guess) and fixed username 2017-07-31 01:10:01 +02:00
csoler
0636142a41 Merge pull request #973 from PhenomRetroShare/Fix_DontShowAnonIconWhenImageDisabled 
Fix Don't show Anonymous Icon when Images are disabled in ChatWidget
 2017-07-30 21:29:37 +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
Phenom
c2a3e46700 Fix WebUI Setting Saving. 2017-07-30 18:29:03 +02:00
Phenom
eb75946133 Fix Don't show Anonymous Icon when Images are disabled in ChatWidget 2017-07-30 15:31:10 +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
c5fc8f89ef replaced images in homepage with the logo without flares 2017-07-30 14:40:53 +02:00