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,893 Commits 63 Branches 22 Tags 194 MiB
385f44bf61
Commit Graph

11893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
385f44bf61
Merge pull request #1188 from PhenomRetroShare/Fix_SharedFileDialogShowColumn 
Fix SharedFilesDialog show old hidden column.
 2018-02-22 23:03:48 +01:00
Phenom
c141eae828 Fix SharedFilesDialog show old hidden column. 2018-02-22 18:54:14 +01:00
csoler
4dfeab2781
Merge pull request #1187 from csoler/master 
merge of reviewed parts of PR1103
 2018-02-20 23:30:52 +01:00
Phenom
73d11e1857
Fix Gcc Warning in nxsmsgsync_test.cc 
/trunk/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc:28:
warning: deleting object of abstract class type ‘RsGixsReputation’ which
has non-virtual destructor will cause undefined behavior [-Wdelete-non-
virtual-dtor]
  delete mRep ;
/trunk/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc:29:
warning: deleting object of abstract class type ‘RsGcxs’ which has non-
virtual destructor will cause undefined behavior [-Wdelete-non-virtual-
dtor]
  delete mCircles;
/trunk/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc:30:
warning: deleting object of abstract class type ‘PgpAuxUtils’ which has
non-virtual destructor will cause undefined behavior [-Wdelete-non-
virtual-dtor]
  delete mPgpUtils;
 2018-02-20 23:28:48 +01:00
Phenom
737a2b440d
Fix Gcc Warning in nxstesthub.cc 
/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc:109: warning:
deleting object of polymorphic class type ‘NotifyWithPeerId’ which has
non-virtual destructor might cause undefined behavior [-Wdelete-non-
virtual-dtor]
   delete *it ;
 2018-02-20 23:27:59 +01:00
Phenom
cfcdec458a
Fix Gcc Warning in support.h 
/tests/unittests/libretroshare/serialiser/support.h:168: warning:
suggest explicit braces to avoid ambiguous ‘else’ [-Wdangling-else]
  if (outfi)
/tests/unittests/libretroshare/serialiser/support.h:234: warning:
suggest explicit braces to avoid ambiguous ‘else’ [-Wdangling-else]
         if (outfi)
 2018-02-20 23:27:28 +01:00
Phenom
aadb9acbab
Fix Gcc Warning in NetworkDialog.cpp 
/retroshare-gui/src/gui/NetworkDialog.cpp:83: warning: unused parameter
‘parent’ [-Wunused-parameter]
 NetworkDialog::NetworkDialog(QWidget *parent)
/retroshare-gui/src/gui/NetworkDialog.cpp:161: warning: this ‘if’ clause
does not guard... [-Wmisleading-indentation]
     if(l.empty())
 2018-02-20 23:16:58 +01:00
csoler
e3d8d86044
updated translation files 2018-02-20 23:03:33 +01:00
csoler
4d7997b2ce
Merge pull request #1186 from csoler/v0.6-FT 
V0.6 ft
 2018-02-20 21:08:09 +01:00
csoler
a1b378e6f4
fixed ghost rows in TransfersDialog 2018-02-20 21:07:02 +01:00
csoler
c897962678
merged 2018-02-20 20:26:33 +01:00
csoler
11d607e997
Merge pull request #1179 from PhenomRetroShare/Add_ChangeAddIconForChannelForum 
Change Add Channel/Forum post by Add.png
 2018-02-20 20:19:10 +01:00
csoler
35b54bbcb7
Merge pull request #1180 from PhenomRetroShare/Add_ClearGxsGroupFrameWhenNoSelection 
Clear GxsGroupFrame When No Selection
 2018-02-20 20:18:31 +01:00
csoler
fec2b2e4d0
Merge pull request #1182 from PhenomRetroShare/Add_SplitFileNbSize 
Split Number of Files and Size in RemoteDirModel.
 2018-02-20 19:20:02 +01:00
Phenom
798ad15c3b Split Number of Files and Size in RemoteDirModel. 2018-02-19 20:13:54 +01:00
G10h4ck
afc43d0ff7
Merge pull request #1181 from Kcchouette/patch-1 
Update markdown to be visible on github
 2018-02-19 15:33:28 +01:00
Kcchouette
8492a40a0d
Update markdown to be visible on github 2018-02-19 15:17:59 +01:00
Phenom
71e1a46fa6 Clear GxsGroupFrame When No Selection 2018-02-18 23:13:27 +01:00
Phenom
8710761ad4 Change Add Channel/Forum post by Add.png 2018-02-18 19:15:14 +01:00
csoler
51f5d1958e
merged uptream/master 2018-02-18 18:00:24 +01:00
csoler
2bc0629cc7
Merge pull request #1178 from PhenomRetroShare/Fix_BugsInRsCollectionDialog 
Fix bugs in rs collection dialog
 2018-02-18 17:59:00 +01:00
csoler
2511934fb0
Merge pull request #1177 from csoler/v0.6-FT 
added limiter in number of responses forwarded back by turtle search,…
 2018-02-18 17:58:06 +01:00
csoler
7a844921ad
Merge pull request #1176 from csoler/v0.6-SecurityFixes 
added load/save of known forums to avoid re-displaying it in the News…
 2018-02-18 17:57:42 +01:00
csoler
7cda064ef4
merged uptream/master 2018-02-18 17:56:51 +01:00
Phenom
931fdd026e Fix bug in processSettings in RsCollectionDialog.cpp 2018-02-18 17:31:06 +01:00
Phenom
d87061ddb3 Fix bug when adding new items when hashing in RsCollectionDialog 2018-02-18 17:31:06 +01:00
Phenom
6d0945fbab Fix bug when removing root item in RsCollectionDialog 2018-02-18 17:31:06 +01:00
csoler
6fe14136ae
added limiter in number of responses forwarded back by turtle search, which should avoid bursts of bandwidth for popular requests 2018-02-17 23:37:25 +01:00
csoler
8708dd9b94
fixed bug due to wrong service ID in serializer 2018-02-17 12:04:13 +01:00
csoler
d57f933109
added load/save of known channels to avoid re-displaying it in the NewsFeed after then have been deleted. 2018-02-16 23:51:43 +01:00
csoler
252626f5ec
added load/save of known forums to avoid re-displaying it in the NewsFeed after then have been deleted. 2018-02-16 23:24:01 +01:00
csoler
63ddccd2ca
Merge pull request #1175 from PhenomRetroShare/Fix_NewChatInvite 
Fix New Chat Invite
 2018-02-16 13:22:19 +01:00
Phenom
83b6205af3 Fix New Chat Invite 2018-02-16 10:22:59 +01:00
csoler
5e344679f3
Merge pull request #1174 from csoler/v0.6-SecurityFixes 
improved cost of reseting search in SharedFileDialog by saving hidden…
 2018-02-15 00:06:13 +01:00
csoler
47f9a4907b
improved cost of reseting search in SharedFileDialog by saving hidden indexes list 2018-02-15 00:02:08 +01:00
csoler
9c60ff76b3
Merge pull request #1172 from csoler/v0.6-SecurityFixes 
hide advanced mode option since it is not used anywhere in the software
 2018-02-14 22:10:11 +01:00
csoler
72124bbd3f
hide advanced mode option since it is not used anywhere in the software 2018-02-14 22:08:07 +01:00
csoler
ede51ab33d
Merge pull request #1171 from csoler/v0.6-SecurityFixes 
V0.6 security fixes
 2018-02-14 22:02:20 +01:00
csoler
cf33221f2f
removed dead code in previous commit 2018-02-14 22:00:46 +01:00
csoler
ddb2c45790
disable and hide signature checkbox when key is already signed in ConnectWizard 2018-02-14 21:56:12 +01:00
csoler
42b8eccfd2
prevent RS from making friends with your own location 2018-02-14 21:48:56 +01:00
csoler
558bb9f760
fixed retro-tor build on master branch 2018-02-12 23:17:29 +01:00
csoler
3f9c72e24e
Merge pull request #1170 from csoler/v0.6-FT 
V0.6 ft
 2018-02-12 22:42:22 +01:00
csoler
d8b193c10b
fixed merge with master 2018-02-12 22:40:15 +01:00
csoler
01cc2322e8
fixed appearing false line in Transfers 2018-02-12 22:39:11 +01:00
csoler
8afa127ed5
fixed crash in RsCollection creation 2018-02-12 20:30:01 +01:00
csoler
0491e43118
Merge pull request #1169 from csoler/v0.6-FT 
V0.6 ft
 2018-02-11 21:28:43 +01:00
csoler
7a2d874863
Merge pull request #1153 from csoler/v0.6-TorOnly 
V0.6 tor only
 2018-02-11 20:49:45 +01:00
csoler
a2eb145459
fixed option in .pri for retrotor configuration 2018-02-11 20:40:38 +01:00
csoler
5f106c4769 fixed compilation on ubuntu precise 2018-02-10 15:42:24 +01:00