Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-19 04:44:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,322 Commits 63 Branches 22 Tags 196 MiB
ed0ea3aa01
Commit Graph

16322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
8539dd503a fixed deadlock caused by wrong order in mutex lock 2021-05-04 19:49:47 +02:00
howdy-partner
fe53ee4842 Fix libupnp autodetection for qmake 2021-04-25 23:38:00 +03:00
sehraf
b4be02c57b
rebase on 0.6.6 2021-04-09 16:15:40 +02:00
csoler
12e556c204
Merge pull request #2403 from csoler/v0.6-BugFixing_10 
fixing VOIP compilaiton on ubuntu 20.04
 2021-04-04 14:44:49 +02:00
csoler
d1e44adb3e Merge remote-tracking branch 'upstream/master' into v0.6-BugFixing_10 2021-04-04 14:41:58 +02:00
csoler
b2f9ac5b71 fixed VOIP compilation on ubuntu 20.04 2021-04-04 14:40:15 +02:00
defnax
c71b99c902
Merge pull request #2402 from defnax/macos 
Update MacOS_X_InstallGuide.md
 2021-04-03 14:19:04 +02:00
defnax
7702ad69f3 Update MacOS_X_InstallGuide.md 2021-04-03 11:24:49 +02:00
defnax
4fe3c955a3 Update MacOS_X_InstallGuide.md 2021-04-02 23:00:10 +02:00
defnax
a847541c1b
Merge pull request #2401 from defnax/macos 
update macOs compile instruction
 2021-04-02 14:59:20 +02:00
defnax
bba3051a54 Update MacOS_X_InstallGuide.md 2021-04-02 12:45:19 +02:00
defnax
729f36c792 Update MacOS_X_InstallGuide.md 2021-04-02 12:29:21 +02:00
defnax
0683bd2717 Update MacOS_X_InstallGuide.md 2021-04-02 12:02:01 +02:00
csoler
cd61ec8635 move initialization of UI at the top in NewsFeed 2021-03-31 22:31:00 +02:00
csoler
3f50f6f2d6
Merge pull request #2385 from RetroShare/v0.6.6-Official-Release 
Recent fixes to V0.6.6 official release
 2021-03-31 15:40:44 +02:00
csoler
fd5766a5fb added the possibility to clear the avatar when editing 2021-03-31 15:35:50 +02:00
csoler
5274a060e5 fixed use of no avatar instead of default avatar image when creating a new ID 2021-03-31 15:35:37 +02:00
csoler
9617ee5135 added the possibility to clear the avatar when editing 2021-03-29 22:25:03 +02:00
defnax
9a500dc62f Update MacOS_X_InstallGuide.md 2021-03-29 18:22:32 +02:00
csoler
b4a3d67486 fixed use of no avatar instead of default avatar image when creating a new ID 2021-03-28 13:26:49 +02:00
csoler
fae6314374
Merge pull request #2398 from hunbernd/fix/avatartooltip 
Fix avatar tooltip
 2021-03-28 11:11:31 +02:00
hunbernd
4d6aa8ab5b Raise avatar size to better match the amount of text 2021-03-27 23:32:47 +01:00
hunbernd
f90692f8f2 Fixed avatar tooltip 2021-03-27 23:17:52 +01:00
defnax
1ed1842a1b
Merge pull request #2397 from defnax/macos 
Update MacOS_X_InstallGuide.md
 2021-03-27 15:04:36 +01:00
defnax
bfc0456730 Update MacOS_X_InstallGuide.md 2021-03-27 13:42:47 +01:00
defnax
3c45bb5553
Merge pull request #2396 from defnax/macos 
Added to ship gui and chat styles for macOS
 2021-03-26 23:58:51 +01:00
defnax
dca887ab9e Added OBJECTS_DIR for macOS section 2021-03-26 23:03:58 +01:00
defnax
43eeca57b9 Added to ship gui and chat styles for macOS 2021-03-26 21:22:48 +01:00
defnax
e7a87d89eb
Merge pull request #2395 from defnax/macos 
Update MacOS_X_InstallGuide.md
 2021-03-26 21:18:13 +01:00
csoler
e22e1c1a8b
Merge pull request #2393 from hunbernd/fix/WebUI-binary-files 
Fix: WebUI truncating binary files
 2021-03-26 20:15:33 +01:00
defnax
a7c2ec43a3 Update MacOS_X_InstallGuide.md 2021-03-26 17:36:01 +01:00
defnax
ad568aa786
Merge pull request #2394 from defnax/macos 
Update MacOS_X_InstallGuide.md
 2021-03-26 15:33:12 +01:00
defnax
f17d2eb4df Update MacOS_X_InstallGuide.md 2021-03-26 12:49:08 +01:00
defnax
a783ffac75 Update MacOS_X_InstallGuide.md 2021-03-26 12:06:10 +01:00
hunbernd
bb6841370f Fix: WebUI truncating binary files. 
Fixes font files not loading properly in the webui problem.
 2021-03-25 18:20:11 +01:00
Gioacchino Mazzurco
2064d7c6ff
Update OBS submodule 2021-03-24 17:48:19 +01:00
Gioacchino Mazzurco
67c607cb32
Fix Android compilation 2021-03-23 23:16:31 +01:00
defnax
914a2eca55
Merge pull request #2391 from defnax/macos 
removed the old macos instructions
 2021-03-23 13:55:34 +01:00
defnax
505a963212 removed the old macos instructions 2021-03-22 19:11:23 +01:00
csoler
a6573826b2
Merge pull request #2386 from rottencandy/event-api-cors 
Include CORS headers in response for rsEvents/registerEventsHandler
 2021-03-20 13:49:28 +01:00
Mohammed Saud
bf41f8ad92 add CORS headers to rsEvents/registerEventsHandler 2021-03-19 23:10:43 +05:30
csoler
2f793b3de1
Merge pull request #2381 from PhenomRetroShare/Fix_BroadcastHistoryRestore 
Fix Name in Broadcast history restore.
 2021-03-18 23:04:16 +01:00
csoler
7559b06c6b
Merge pull request #2376 from PhenomRetroShare/Fix_RemoveBadRS_ERRInFriendListModel 
Fix Remove bad RS_ERR in FriendListModel
 2021-03-18 23:02:15 +01:00
thunder2
5b1b0cadf9 Moved tor binaries into subfolder "tor" for Windows build 2021-03-16 21:43:26 +01:00
sehraf
feaea75847
fixup rebase 2021-03-16 21:15:32 +01:00
sehraf
911cbeb61a
fix key generation and cleanup 2021-03-16 21:15:31 +01:00
sehraf
27fa8a35b0
fix key generation and cleanup 2021-03-16 21:15:31 +01:00
sehraf
5418483934
fixed wrong size check 2021-03-16 21:15:31 +01:00
sehraf
aef993de55
reduce log 2021-03-16 21:15:31 +01:00
sehraf
8a2efe3e58
use libsam3 git submodule 2021-03-16 21:15:31 +01:00