Commit Graph

9745 Commits

Author SHA1 Message Date
csoler
f39272a709 fixed compilation in debug mode for p3filelists.cc 2016-11-04 21:43:09 +01:00
Cyril Soler
8c1a6537b4 Merge pull request #557 from mr-alice/v0.6-FTEncryption
V0.6 ft encryption
2016-11-04 20:02:14 +01:00
mr-alice
2bb9a87b3b merged and fixed conflict with upstream/master 2016-11-04 13:52:11 +01:00
mr-alice
30860b8f1a removed ^M that polluted unittests.pro 2016-11-04 13:46:20 +01:00
Cyril Soler
45cb442834 Merge pull request #558 from csoler/v0.6-FileListsOptim
reducing linear cost of allocateNewIndex to constant. Should improve …
2016-11-04 09:47:49 +01:00
Cyril Soler
2bf2465653 Merge pull request #498 from PhenomRetroShare/Fix_ElCapitanCompil
Fix El Capitan OSX 10.11 Compil and older
2016-11-04 09:18:34 +01:00
csoler
8dacb22049 reducing linear cost of allocateNewIndex to constant. Should improve huge lags when receiving big file lists for the first time 2016-11-03 22:32:27 +01:00
mr-alice
e324d7d251 removed warning in ftserver for rejected non encrypted tunnels 2016-11-03 20:31:47 +01:00
mr-alice
8653649132 fixed two bugs in ShareManager popup menu 2016-11-03 20:26:35 +01:00
mr-alice
29b5bfe049 attempt to fixed leading tabs 2016-11-03 08:50:13 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
mr-alice
1c2cfb2a03 removed debug info in ftServer 2016-11-02 21:32:14 +01:00
mr-alice
5aef67d332 fixed tooltips in ShareManager, and fixed anonymous search mechanism 2016-11-02 21:31:14 +01:00
mr-alice
d2118c5329 supressed deadlock in ftController due to calling ftServer from ftcontroller itself 2016-11-02 20:51:42 +01:00
Cyril Soler
46dd5be2f2 Merge pull request #554 from hunbernd/feature/paste-RS-link
Automatically detect retroshare links when pasting text
2016-11-01 16:30:46 +01:00
mr-alice
02f442a400 changed naming for files visibility 2016-11-01 14:28:00 +01:00
mr-alice
8c7c7647b0 fixed conflicts in merging upstream/master to v0.6-FTEncryption 2016-11-01 14:23:13 +01:00
mr-alice
6a3610e6cb disallow double tunnels (encrypted+clear) in Accepted mode, since it is not needed 2016-11-01 14:13:43 +01:00
mr-alice
ffdac640d8 fixed swarming with encrypted end-to-end tunnels 2016-11-01 11:57:25 +01:00
mr-alice
c6df59a421 fixed bug in duplication of virtual dir names 2016-11-01 11:11:28 +01:00
mr-alice
761d595cb7 fixed layout and names in ShareManager and SharedFilesDialog 2016-11-01 10:46:29 +01:00
mr-alice
3430eece22 fixed display of share flags as a proper nice icon set 2016-11-01 10:30:36 +01:00
mr-alice
8fe85b9bdd improved ShareManager a little bit more 2016-10-31 23:24:35 +01:00
mr-alice
9d586bcfb0 made a drastic simplification pass on the ShareManager, which now only needs a single window except for selecting files using a QFileDialog 2016-10-31 16:28:26 +01:00
mr-alice
e8e054eeae addednew flag for anonymous search. Merged the two browsable flags in one single flag. 2016-10-31 14:26:01 +01:00
Cyril Soler
f934e88fdf Merge pull request #555 from hunbernd/fix/random-emoji-order
Fixed emoticon order
2016-10-31 12:12:40 +01:00
hunbernd
36dc532da6 Automatically detect retroshare links when pasting text 2016-10-31 01:07:50 +01:00
hunbernd
05b5c08e9f Fixed emoticon order 2016-10-30 19:42:28 +01:00
mr-alice
5b9ef04358 improved debug output in ftserver 2016-10-30 15:33:05 +01:00
mr-alice
def20a3f4c encrypted FT works. Fixed last bugs in ftServer 2016-10-30 15:11:22 +01:00
mr-alice
34dcb410b4 fixed a few bugs in ftServer for encrypted tunnel management 2016-10-30 11:36:00 +01:00
mr-alice
9a881619e1 added record for H(H(F)) in LocalDirectoryStorage 2016-10-29 18:35:48 +02:00
mr-alice
d843c1c1a6 put consts behind serial_size() and serialise() in turtle items and ft items 2016-10-29 18:18:02 +02:00
mr-alice
babc126be3 added default encryption policy variable and GUI to change it 2016-10-29 17:59:03 +02:00
mr-alice
8486346368 added new encryption/authentication format AEAD_chacha20_sha256 2016-10-26 22:05:56 +02:00
Gio
10ec1144eb Simplify QML to work better on both Desktop and Phone
- Set request method to GET by default in ApiLocalConnectionHandler to avoid
/peers request fail randomly
- Use TabView instead of SwipeView to not depend on Qt 5.7.0 (latest version)
- AddTrustedNode simplified layout to avoid unexpected behaviour on some phones
- Locations add sslid property to root Item to avoid unexpected behaviour when
multiple locations are available
- TrustedNodesView color connected friends with green and offline with grey
- Ignore kdevelop 4 files
2016-10-26 20:37:28 +02:00
mr-alice
c87ca67120 improved efficiency of AEAD 2016-10-26 18:15:47 +02:00
mr-alice
88298b997e added check for cleartext in AEAD test vector #1 2016-10-26 14:45:21 +02:00
mr-alice
42f6f26820 fixed bug in AEAD 2016-10-26 14:36:35 +02:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Cyril Soler
7e536efe66 Merge pull request #549 from PhenomRetroShare/Fix_PR#536
Fix PR#536 revealing of bad factor management in StyledElidedLabel.
2016-10-26 11:35:30 +02:00
mr-alice
177752e6af fixed a few bugs in AEAD construction based on test results 2016-10-25 23:16:36 +02:00
Phenom
32e54e53b7 Fix PR#536 revealing of bad factor management in StyledElidedLabel. 2016-10-25 18:39:22 +02:00
mr-alice
0570427c1d added google test for chacha20 code 2016-10-25 14:09:39 +02:00
mr-alice
0387a28e78 added methods to get files from hash(hash) in directory_storage and ftServer 2016-10-25 00:08:27 +02:00
Cyril Soler
5f5b0d44bb Merge pull request #548 from PhenomRetroShare/Fix_PR#540
Fix PR#540
2016-10-24 20:16:20 +02:00
Phenom
fd5a5cc804 Fix PR#540 2016-10-24 20:11:47 +02:00
mr-alice
2d72b88130 added code for AEAD construction 2016-10-24 15:59:34 +02:00
Cyril Soler
bd4c252e01 Merge pull request #539 from RetroShare/md-fix
Update README.md
2016-10-23 23:30:56 +02:00
Cyril Soler
f3bebc030b Merge pull request #540 from PhenomRetroShare/Fix_EmbedInHtmlAhref
Fix handle of url in EmbedInHtmlAhref.
2016-10-23 23:29:06 +02:00