Commit Graph

15871 Commits

Author SHA1 Message Date
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
Phenom
017f2886b3 Fix Name in Broadcast history restore. 2021-03-16 11:00:18 +01:00
defnax
130d846e47
Merge pull request #2379 from defnax/travis-attempt-fix
attempt to fix travis
2021-03-14 12:22:12 +01:00
defnax
c8ab9e0bd5 attempt to fix 2021-03-14 00:47:57 +01:00
csoler
751fffc30f
Merge pull request #2378 from csoler/v0.6-BugFixing_10
Last fixes (removed debug log) before release
2021-03-13 22:54:52 +01:00
csoler
388140e263 added missing debug ifdef 2021-03-13 22:28:52 +01:00
csoler
4420575a9a removed debug info about superseded groups 2021-03-13 22:28:26 +01:00
csoler
f1b022a6c1 only print the 50 first characters of undisplayed resources 2021-03-13 22:28:06 +01:00
csoler
c9d7cb7e7e fixed wrong define in debug for circles 2021-03-13 22:27:43 +01:00
defnax
2e1716c9e1
Merge pull request #2375 from PhenomRetroShare/Fix_HandleRichText
Fix HandleRichText
2021-03-13 14:16:00 +01:00
Phenom
8ef464e21e Fix Remove bad RS_ERR in FriendListModel 2021-03-13 13:05:07 +01:00
Phenom
21105cac17 Fix HandleRichText 2021-03-13 11:51:06 +01:00
csoler
fb48143b1e
Merge pull request #2373 from csoler/v0.6-BugFixing_10
Trying to fix bug that breaks sorting in NewFriendList
2021-03-12 18:06:20 +01:00
csoler
bd6148ab0f removed debug output 2021-03-11 23:42:09 +01:00
csoler
a5afc2226c fixed sorting lost issue in Network 2021-03-11 21:12:14 +01:00
csoler
30e59133cb proper loading/saving of onLineFriendsOnTop and showOffLineFriends 2021-03-10 21:43:37 +01:00
csoler
e750a3fced improved debug output and code in NewFriendList sorting 2021-03-10 21:04:23 +01:00
csoler
61a79b296e fixed expanded group items in NewFriendList. Added more debug info 2021-03-10 20:43:43 +01:00
G10h4ck
123027dc11
Merge pull request #2370 from G10h4ck/android_scripts_fixup
Fix define_default_value in android scripts
2021-03-09 18:54:09 +01:00
csoler
eee2fe43cf
Merge pull request #2362 from csoler/v0.6-BugFixing_10
A few fixes in People tab
2021-03-08 22:50:26 +01:00
csoler
89b6d95197
Merge pull request #2369 from G10h4ck/fix_RsGxsNetService_requestGrp
Fix list overwrite in RsGxsNetService::requestGrp
2021-03-08 22:50:03 +01:00
csoler
8df1f0bf41 fixed crash due to using twice the same method name in p3gxscircles.h wiht json api header 2021-03-08 20:51:21 +01:00
Gioacchino Mazzurco
20c3131422
Fix define_default_value in android scripts
define_default_value wrongly reported error if the variable was already
  defined, causing the scripts to fail under bash -e, fix it by
  reporting corret exit value
2021-03-08 20:12:50 +01:00
Gioacchino Mazzurco
74dc476282
Fix list overwrite in RsGxsNetService::requestGrp
When requestGrp was called with different groups for same peer multiple
  times between ticks the list was overridden and groups from previous
  call overridden by the new, as a result some requested groups may be
  never really requested. Fix the bug by using a set instead of a list
  so the newly requested groups are uniquely added to the set without
  removing the previously added.
2021-03-08 20:07:07 +01:00
csoler
bc99321b14 fixed merge with upstream/master 2021-03-08 09:34:34 +01:00
csoler
0fa8573dbd removed inconsistent arrows from network list 2021-03-07 21:27:13 +01:00
csoler
6f78952df9 fixed error msg 2021-03-07 21:00:53 +01:00
defnax
51dbbfb222
Merge pull request #2368 from defnax/ui-fix-17
Wiki Editor and stylesheets fixes
2021-03-07 12:52:07 +01:00
defnax
f2bb0c79eb fixing margin 2021-03-07 01:04:27 +01:00
defnax
f7e409519d Wiki Editor and stylesheets fixes 2021-03-07 00:31:05 +01:00
defnax
e46d6783bc
Merge pull request #2365 from PhenomRetroShare/Fix_Windows64G++MSys2Build
Fix Windows 64b G++ under MSys2 compil.
2021-03-06 11:08:32 +01:00
defnax
f0a2fa95ec
Merge pull request #2364 from PhenomRetroShare/Fix_ChatHistoryBrowser
Fix Chat History Browser
2021-03-05 21:30:29 +01:00
Phenom
d78316cbd2 Fix Chat History Browser 2021-03-05 20:18:00 +01:00
Phenom
3d9ba341f0 Fix Windows 64b G++ under MSys2 compil. 2021-03-05 17:40:06 +01:00
defnax
0e38f4870f
Merge pull request #2344 from PhenomRetroShare/Fix_BubbleChatStyle
Fix Bubble Chat Style
2021-03-04 18:41:26 +01:00