Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,880 Commits 63 Branches 22 Tags 195 MiB
424e7be52f
Commit Graph

13880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
G10h4ck
2498f945f4
Merge pull request #1538 from G10h4ck/fix_travis_osx 
Fix Travis CI OSX
 2019-04-23 20:09:13 +02:00
Gioacchino Mazzurco
084a6a2f1e
Wildcard library version path in Travis CI OSX 2019-04-23 19:21:44 +02:00
G10h4ck
9a7ce1ae72
Merge pull request #1520 from G10h4ck/broadcast_discovery 
Broadcast Domain friends IP:Port Discovery
 2019-04-23 17:18:54 +02:00
G10h4ck
7d96b9b7a8
Merge pull request #1536 from G10h4ck/dead_zeroconf 
Remove zeroconf deadcode
 2019-04-23 15:43:55 +02:00
G10h4ck
044d1cc765
Merge pull request #1485 from PhenomRetroShare/Fix_ClangWarnings 
Fix clang warnings
 2019-04-23 13:26:56 +02:00
G10h4ck
9102a698e4
Merge branch 'master' into Fix_ClangWarnings 2019-04-23 12:45:33 +02:00
Gioacchino Mazzurco
5dda6eb771
Remove zeroconf deadcode 2019-04-23 11:57:30 +02:00
defnax
74c7230b1b
Merge pull request #9 from RetroShare/master 
update to master
 2019-04-22 17:34:58 +02:00
csoler
bc8adb74c4
Merge pull request #1502 from defnax/added-group-icons-for-posted-links 
Added group icons for posted links
 2019-04-18 21:56:07 +02:00
defnax
7c534d50ea removed posted links related font-size from qss file 
removed posted links related font-size from qss file
 2019-04-16 19:38:13 +02:00
Gioacchino Mazzurco
cc973d1ea5
Add a bit of documentation about broadcast discovery event 2019-04-16 17:21:37 +02:00
Gioacchino Mazzurco
fcb2875312
Fix a couple of clang warnings 2019-04-16 17:21:37 +02:00
Gioacchino Mazzurco
c727190041
Remove extra debugging in Broadcast Discovery 2019-04-16 15:17:29 +02:00
Gioacchino Mazzurco
2f92dc1757
Update udp-broadcast-cpp solve 2 instance per host limitation 2019-04-15 19:22:25 +02:00
Gioacchino Mazzurco
74fa3bdf2b
Change again C compiler selection in CI 2019-04-15 15:16:47 +02:00
Gioacchino Mazzurco
694bd34f27
Enable broadcast discovery in Travis CI OS X 2019-04-15 13:11:57 +02:00
Gioacchino Mazzurco
9aa116b885
Enforce RsEvent not being instantiable without inheriting 2019-04-15 11:17:26 +02:00
Gioacchino Mazzurco
5554f799c0
Add some info about shared_ptr to weak_ptr future refactor 2019-04-15 10:37:21 +02:00
Gioacchino Mazzurco
a5cdee6078
Fix compilation on Windows 2019-04-15 01:04:44 +02:00
Gioacchino Mazzurco
7dab487bde
Implement a JSON API friendly notification system 
This should bit by bit substitute RsNotify which would be very difficult
  to support properly in JSON API.
The new system is much simpler to use also from the C++ side of the
  moon.
BroadcastDiscovery take advantage of the new system to notify about new
  non friend peer discovered, tested successfully also in JSON API.
 2019-04-15 00:31:49 +02:00
Gioacchino Mazzurco
9c7a8d479f
Pass initialization value in RS_DEFAULT_STORAGE_PARAM 2019-04-15 00:09:01 +02:00
Gioacchino Mazzurco
f2aa2aa543
JSON API avoid capturing shared_ptr in lambda 
use weak_ptr as capture shared_ptr could cause circular ref counting
 2019-04-15 00:07:21 +02:00
Gioacchino Mazzurco
954644ef57
Broadcast discovery fix local port setting 2019-04-15 00:05:40 +02:00
csoler
051e2ee682
Merge pull request #1522 from csoler/v0.6-Turtle 
Add Fast Track items in Turtle and make GxsTunnel to use them. Improves distant chat.
 2019-04-14 20:52:35 +02:00
csoler
c33a265ebd
Merge pull request #1526 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2019-04-14 20:52:04 +02:00
csoler
0bcbe14b2c
fixed wrong display of trash messages in inbox 2019-04-14 16:25:26 +02:00
csoler
64fecf42f4
moved MessagesDialog.* to msgs/ 2019-04-14 15:50:25 +02:00
Gioacchino Mazzurco
e7a2cb5501
Fix licensing in broadcast discovery and JSON API 2019-04-14 12:34:01 +02:00
G10h4ck
bff3cd6845
Merge pull request #1523 from G10h4ck/json_api 
Channel API fixes
 2019-04-13 00:00:39 +02:00
Gioacchino Mazzurco
b25c4ecb77
Fix channels JSON API 2019-04-12 23:10:31 +02:00
Gioacchino Mazzurco
4d703b9df9
Increase waitToken interval for channel creation 
Creating GXS groups imply a bunch of crypto operations that require lot
  of time expecially on embedded device, channel creation was reported
  as failed while it was still pending.
Reduce too long lines.
Print API error messages also on std::cerr.
 2019-04-12 22:14:16 +02:00
Gioacchino Mazzurco
81f73aaf44
Merge branch 'v0.6-ImprovedGUI' of https://github.com/csoler/RetroShare into json_api 2019-04-12 21:39:05 +02:00
csoler
44d0cbe295
finished fast track turtle items for distant chat 2019-04-12 21:29:49 +02:00
Gioacchino Mazzurco
944fc42c69
Broadcast discovery improve debug message 2019-04-12 20:38:17 +02:00
Gioacchino Mazzurco
7eaa7d8c8c
Broadcast discovery act smarter when a friend is discovered 2019-04-12 20:18:08 +02:00
Gioacchino Mazzurco
a7498371a2
Fix Travis and Appveyor continuous integration 
The error reported both on OS X and Windows was
The CMAKE_C_COMPILER is set to a C++ compiler
 2019-04-12 19:56:57 +02:00
G10h4ck
50604f90b6
Merge pull request #1521 from G10h4ck/update_readme 
Fix appveyor badge link
 2019-04-12 12:53:44 +02:00
Gioacchino Mazzurco
4ac6d7b7d1
Fix appveyor badge link 2019-04-12 11:49:42 +02:00
Gioacchino Mazzurco
7b38c1c75a
Initial work on Broadcast Domain Discovery 
Discover peers on the same broadcast domain/LAN
Implements own node announcement
Implements others announcement listening
Implements API to get notifiend when other nodes get discovered
Implements API to get discovered nodes
Add discovered peer locator to rsPeers if it is already friend

Yet a bunch of things to do to take full advantage of this new
implementation
 2019-04-12 02:53:39 +02:00
csoler
3f75bff48b
first branch of faster turtle track for distant chat 2019-04-11 23:57:18 +02:00
csoler
322334b076
fixed compilation warning 2019-04-11 21:04:29 +02:00
csoler
4c8851801f
fixed merging with pending modifications 2019-04-11 21:04:13 +02:00
csoler
0aff3a2b03
Merge pull request #1517 from zapek/mark_as_bad_context_menu_improvement 
Moved the 'Mark as bad' entry in the search result files context menu
 2019-04-11 12:50:12 +02:00
zapek
e9f341908a Moved the 'Mark as bad' entry in the search result files context menu 
further down away from 'Download' to avoid accidental clicks
 2019-04-11 11:27:43 +02:00
G10h4ck
276328dd91
Merge pull request #1512 from G10h4ck/csoler-jsonapi-channel 
Improve GxsChannels API
 2019-04-11 10:13:52 +02:00
Gioacchino Mazzurco
9ad79f0c89
Improve documentation 2019-04-10 21:10:21 +02:00
csoler
43a5312194
Merge pull request #1509 from RetroPooh/trafcount 
display session traffic
 2019-04-10 21:04:53 +02:00
csoler
565afbd834
Merge pull request #1510 from zapek/windows_hash_warning_fix 
fixed wrong file hash daylight saving time warnings on windows
 2019-04-10 20:34:40 +02:00
G10h4ck
a8867f21fb
Merge pull request #1513 from Piraty/license-agpl 
add AGPL license text
 2019-04-10 12:38:44 +02:00
csoler
b128407159 fixed rare bug in chat notify that appeared when your nickname is happenned at the end of the text 2019-04-08 14:33:14 +02:00