Commit graph

  • 9a508cf800
    Merge a8e1144c4f into 6a5e116725 defnax 2025-12-10 20:20:54 +01:00
  • baf19140b8
    Merge 7c347e65e4 into 6a5e116725 defnax 2025-12-09 21:40:38 +00:00
  • 7c347e65e4 Added config defnax 2025-12-09 22:40:30 +01:00
  • c0be74d405 Fixed compile issues with master defnax 2025-12-09 22:02:24 +01:00
  • ef73c5c9a5
    Fix feedtype defnax 2025-12-09 06:46:42 +01:00
  • 1f42061017
    Update rsharesettings.cpp defnax 2025-12-09 05:54:20 +01:00
  • c3bf06692e fix merge defnax 2025-12-08 23:06:06 +01:00
  • 3d2c1f5b2b forget this defnax 2025-12-08 22:42:13 +01:00
  • 927c8f327d rework on wire notify and clean code defnax 2025-12-08 22:35:40 +01:00
  • ced7892f62
    Merge 35edc3b19b into 6a5e116725 defnax 2025-12-08 19:33:06 +01:00
  • 2afc1de9db
    Merge af6ce15ba7 into 6a5e116725 defnax 2025-12-08 12:51:32 +01:00
  • e2dfe1e7b9
    Merge dae321ef8e into 6a5e116725 David Bears 2025-12-07 22:10:24 -05:00
  • 6a5e116725
    Merge pull request #3066 from csoler/v0.6-Notify3 master csoler 2025-12-07 20:34:38 +01:00
  • 7fff0c1894
    Merge pull request #41 from defnax/chatstatus csoler 2025-12-07 18:38:17 +01:00
  • c007723e52
    Merge ef953f4e78 into 6f33dcc8e7 defnax 2025-12-07 13:08:18 +01:00
  • 5c3efdc866 Added to show refused in distant chat defnax 2025-12-07 11:57:05 +01:00
  • a6faeb4ec7
    Merge pull request #40 from defnax/chatstatus csoler 2025-12-07 10:40:32 +01:00
  • ea1d13c1d9 Fixed Avatar update defnax 2025-12-07 10:02:17 +01:00
  • a6ac1ded7a
    Merge pull request #39 from defnax/chatstatus csoler 2025-12-06 23:19:04 +01:00
  • 1ab5ad0a8e Added chat status display defnax 2025-12-06 22:13:09 +01:00
  • 7873082d28 switched PopupDistantChatDialog to rsEvents csoler 2025-12-06 17:48:41 +01:00
  • 91605ba89b
    Merge 9178bc53ef into 6f33dcc8e7 PhenomRetroShare 2025-12-06 15:40:23 +01:00
  • 18ce2a6e86
    Merge c8eb29d895 into 6f33dcc8e7 defnax 2025-12-06 14:28:46 +01:00
  • 5019aff9b7
    Merge ef886b9d5b into 6f33dcc8e7 defnax 2025-12-06 13:43:33 +01:00
  • 79110bc23f
    Merge 453173294b into 6f33dcc8e7 defnax 2025-12-06 12:42:54 +00:00
  • 453173294b
    Merge branch 'RetroShare:master' into login-dialog defnax 2025-12-06 13:42:51 +01:00
  • 49dff402a3
    Merge 38374883f2 into 6f33dcc8e7 defnax 2025-12-06 13:35:42 +01:00
  • c230aa3665
    Merge 7c9684e331 into 6f33dcc8e7 defnax 2025-12-06 11:47:36 +01:00
  • 6f33dcc8e7
    Merge pull request #3055 from thunder2/fix-notify csoler 2025-12-06 10:09:28 +01:00
  • e80ad9577d
    Merge pull request #3056 from thunder2/fix-status csoler 2025-12-06 10:08:46 +01:00
  • 9eb3d1b442
    Merge pull request #3060 from Passw/patch-3 csoler 2025-12-06 10:07:56 +01:00
  • a0934e2990
    Merge pull request #3061 from Passw/patch-4 csoler 2025-12-06 10:00:09 +01:00
  • d92f5408a7
    Merge pull request #3062 from Passw/patch-5 csoler 2025-12-06 09:59:36 +01:00
  • a4d14005aa
    Merge pull request #3063 from Passw/patch-6 csoler 2025-12-06 09:58:54 +01:00
  • 573b46b19d Fixed crash (NULL pointer access) in RsGUIEventManager::async_handleIncomingEvent with activated plugins thunder2 2025-11-30 20:24:10 +01:00
  • 721cfb9e18 Added changes of RsChatFlags and RsStatusValue to VOIP plugin thunder2 2025-11-30 20:32:09 +01:00
  • 296b612965 fixed merge csoler 2025-12-05 17:09:39 +01:00
  • 01cdbe68d9
    Merge pull request #3065 from JohannesKleine/fix-merge-error csoler 2025-12-05 17:08:27 +01:00
  • 1e3be2b159 fixed duplicate code (posibly due to problem while merging) csoler 2025-12-05 17:03:29 +01:00
  • 499860ee09
    remove duplicate code introduced by merging Christoph Johannes Kleine 2025-12-05 15:43:41 +01:00
  • ef953f4e78
    Merge branch 'RetroShare:master' into profile-generation-fixes-ui defnax 2025-12-04 21:22:07 +01:00
  • 35befa9fd2
    Merge 040c6498c3 into e029ff89f9 defnax 2025-12-04 21:19:15 +01:00
  • e029ff89f9
    Merge pull request #3064 from defnax/fix-board-noty csoler 2025-12-04 19:01:07 +01:00
  • 64efeae56a Fix Boards update notify defnax 2025-12-04 18:39:59 +01:00
  • 13c4699236
    Fix comments PostedListWidgetWithModel.cpp Passw 2025-12-04 11:22:36 +08:00
  • 85527be02e
    Fix comment and macro PostedListWidgetWithModel.h Passw 2025-12-04 11:17:16 +08:00
  • ac79ede45b
    Fix comments and header macro GxsChannelPostsWidgetWithModel.h Passw 2025-12-04 11:09:49 +08:00
  • dc0b0cd4af
    Fix comments GxsChannelPostsWidgetWithModel.cpp Passw 2025-12-04 10:59:20 +08:00
  • 735a1b50c9
    Merge pull request #3059 from Passw/patch-2 csoler 2025-12-03 17:14:24 +01:00
  • 4cddaf78cb
    Fix missing space in SecurityIpItem.cpp Passw 2025-12-03 17:44:08 +08:00
  • 786b90de5e
    Merge pull request #3058 from csoler/v0.6-Notify3 csoler 2025-12-02 18:18:38 +01:00
  • 350a3da359 added comment about plugin confirmation GUI code csoler 2025-12-01 22:33:19 +01:00
  • 943e597291 fixed plugin loading csoler 2025-12-01 22:24:06 +01:00
  • a1a0d067df
    fix error: 'fromTime_t' is not a member of 'QDateTime' when build with Qt6 Passw 2025-12-01 12:02:12 +08:00
  • 3baf444452
    Merge pull request #3054 from csoler/v0.6-Feeds csoler 2025-11-30 19:07:45 +01:00
  • 3842427fb6 fixed compilation bug csoler 2025-11-30 19:04:33 +01:00
  • 943c22412f
    Merge pull request #3047 from csoler/v0.6-Feeds csoler 2025-11-30 18:13:49 +01:00
  • 553d2e8f50
    Merge pull request #2951 from csoler/v0.6-Notify2 csoler 2025-11-30 18:13:32 +01:00
  • e3d05d5474 moved GxsFeedItem and GxsGroupFeedItem to feeds/ as a more appropriate place csoler 2025-11-30 17:07:04 +01:00
  • 96c150caf2 fixd drand48() call csoler 2025-11-25 21:38:50 +01:00
  • 28a5db7204 fixed compilation for feed reader plugin csoler 2025-11-24 21:09:45 +01:00
  • 996400aaf4
    Merge 07b4e79048 into fa91380765 defnax 2025-11-24 18:47:55 +00:00
  • 07b4e79048
    Merge branch 'RetroShare:master' into wire_notifynew defnax 2025-11-24 19:47:52 +01:00
  • 2eb48e0305 added deferred update to feed items csoler 2025-11-22 17:51:42 +01:00
  • c8eb29d895
    Merge branch 'RetroShare:master' into Forum-fonts defnax 2025-11-22 15:25:55 +01:00
  • af6ce15ba7 for boards links use linkColor too defnax 2025-11-22 15:17:12 +01:00
  • 35edc3b19b
    Merge branch 'RetroShare:master' into fileuploadstatsv2 defnax 2025-11-22 13:51:13 +01:00
  • 486048add7 Added colored links feature defnax 2025-11-21 23:43:06 +01:00
  • 7c9684e331
    Merge branch 'RetroShare:master' into w10darkmode defnax 2025-11-19 19:35:20 +01:00
  • d86c5dabd3 added picture size variables in feed items csoler 2025-11-19 18:22:45 +01:00
  • a94c85751e improved layout of board post item csoler 2025-11-18 22:01:12 +01:00
  • 68ee14e8c0 added expand button for board post items csoler 2025-11-18 21:52:20 +01:00
  • c9c4b4c9d8 added PhotoView to BoardsPostItem csoler 2025-11-17 22:51:46 +01:00
  • 67e07b14fd merged with upstream/master csoler 2025-11-17 21:52:47 +01:00
  • 784933dbd4 added new boards post item in feeds csoler 2025-11-17 21:23:42 +01:00
  • 5d392983ed
    Merge d3071e8fe2 into fa91380765 defnax 2025-11-16 15:22:24 -05:00
  • e3fb303174
    Merge 802541fa51 into fa91380765 defnax 2025-11-16 15:22:24 -05:00
  • 16dec30701
    Merge ab72019d26 into fa91380765 defnax 2025-11-16 15:22:24 -05:00
  • 10b9eb2a13
    Merge 75e03f91ff into fa91380765 defnax 2025-11-16 15:22:24 -05:00
  • ff19353a0c
    Merge 57d4be0909 into fa91380765 defnax 2025-11-16 16:57:24 +03:00
  • 07f415b4c4 fixed calling virtual functions in constructor csoler 2025-11-15 22:33:22 +01:00
  • fa91380765
    Merge pull request #3044 from defnax/feeds-test csoler 2025-11-15 21:02:22 +01:00
  • 567d350e76
    Merge pull request #3049 from defnax/fix-people csoler 2025-11-15 21:01:20 +01:00
  • 0629113d16 Fix wording defnax 2025-11-15 16:58:34 +01:00
  • 25b3421b98 Fix comment check defnax 2025-11-15 16:36:48 +01:00
  • 3385abfdc6 Added comment for test feeds defnax 2025-11-15 15:21:04 +01:00
  • 05fe8adbd1 fixed bug in setting msg as read in forum msg item csoler 2025-11-12 21:17:31 +01:00
  • ba4b8e7ff5
    Merge pull request #3046 from Passw/patch-1 csoler 2025-11-12 09:37:06 +01:00
  • 24540db6aa
    fix typo WindowsMSys2_InstallGuide.md Passw 2025-11-12 09:12:05 +08:00
  • d3069e9b44 fixed compilation csoler 2025-11-11 20:12:53 +01:00
  • b8bb797171 fixed compilation csoler 2025-11-11 19:01:04 +01:00
  • a91a0893cf renamed NotifyQt into RsGUIEventManager csoler 2025-11-11 18:56:24 +01:00
  • 72ae5b74ac added more feed tests defnax 2025-11-10 18:43:22 +01:00
  • 390084971a merged with upstream csoler 2025-11-10 14:14:21 +01:00
  • 383b1e7d2b
    Merge pull request #3042 from csoler/v0.6-Feeds csoler 2025-11-10 14:12:21 +01:00
  • 20ff1380ae
    Merge pull request #3040 from dbear496/fix-permmatrix-global csoler 2025-11-09 19:16:23 +01:00
  • ae5f91700e updated libretroshare submodule to latest commit csoler 2025-11-07 23:39:04 +01:00
  • 7babc118ff
    Merge pull request #3043 from csoler/v0.-ImprovedGUI3 csoler 2025-11-07 15:16:32 +01:00
  • 0502dba2e6 fixed missing link in ChannelsCommentsItem csoler 2025-11-07 14:26:19 +01:00
  • 82215711c2 fixed arrow problem in sync time menu csoler 2025-11-07 10:15:10 +01:00