Commit Graph

12033 Commits

Author SHA1 Message Date
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
5970ff239b Merge pull request #1052 from csoler/v0.6-FT
removed delay when calling forceUpdate() on directories
2017-09-25 21:14:30 +02:00
csoler
40cda111d2 removed delay when calling forceUpdate() on directories 2017-09-25 21:05:42 +02:00
csoler
b969f313b0 Merge pull request #1050 from csoler/v0.6-FT
V0.6 ft
2017-09-25 20:59:32 +02:00
csoler
d8cb3fe35a fixed not rehashing files that already exist in a different directory pointed by a symlink 2017-09-25 20:56:35 +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
f497905497 fixed limitation of directory depth when indexing files 2017-09-24 23:43:52 +02:00
csoler
abd7e25a2e added checks for mMaxShareDepth and mIgnoreDuplicates 2017-09-24 18:14:45 +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
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
Pooh
3416a6d5c9 Update TurtleRouterDialog.cpp 2017-09-16 12:15:03 +03: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
Gioacchino
6ad2306335 Merge pull request #1039 from PhenomRetroShare/Fix_WinCompil
Fix Windows Build
2017-09-15 16:19:48 +02:00
RetroPooh
ecee1e645c allow multiple filenames display for a single hash in search 2017-09-15 17:09:34 +03:00
Phenom
f4166860e8 Fix Windows Build 2017-09-15 15:04:43 +02:00
RetroPooh
b9be37b245 search spy more files 2017-09-15 15:16:36 +03:00
RetroPooh
41251fdd9e search spy 2017-09-15 15:03:06 +03: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