Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 15:28:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,639 Commits 63 Branches 22 Tags
Commit Graph

16639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
44bb2c0f05
Merge pull request #2710 from defnax/copyimage-clipboard 
Added copy image to clipboard feature
 2023-04-17 22:16:39 +02:00
defnax
3004505832 Added copy image to clipboard feature 2023-04-17 21:01:57 +02:00
csoler
8dfa772782
Merge pull request #2706 from thunder2/SaveImage 
Moved QAction for saving an image from customContextMenu of GxsForumT…
 2023-04-17 19:56:17 +02:00
csoler
a61c32d84c
Merge pull request #2705 from defnax/boardspasteicon 
Added paste icon for paste button - boards
 2023-04-17 19:48:19 +02:00
csoler
b64e4d5645
Merge pull request #2708 from thunder2/CreateGxsForumMsg 
Removed include of ui_CreateGxsForumMsg.h from CreateGxsForumMsg.h
 2023-04-17 13:59:00 +02:00
csoler
7911622d17
Merge pull request #2703 from defnax/wireaccountbox 
Display on account selection box the headShot image
 2023-04-17 13:55:34 +02:00
csoler
09d293909a
Merge pull request #2709 from thunder2/PostedCreatePostDialog 
Removed unnecessary include in PostedCreatePostDialog.h
 2023-04-17 13:51:49 +02:00
csoler
66b2d7c81c
Merge pull request #2685 from csoler/v0.6-Channels-001 
Improvement of channel version sync (Needs PR #80)
 2023-04-16 23:36:22 +02:00
thunder2
4802de9e52 Removed include of ui_CreateGxsForumMsg.h from CreateGxsForumMsg.h 2023-04-16 16:29:47 +02:00
thunder2
09dd588e7f Removed unnecessary include in PostedCreatePostDialog.h 2023-04-16 16:27:39 +02:00
thunder2
dceda36f6e Moved QAction for saving an image from customContextMenu of GxsForumThreadWidget and ChatWidget to RSTextBrowser 2023-04-15 22:21:34 +02:00
defnax
cd14b2e9bb Added paste icon for boards 2023-04-15 19:30:00 +02:00
defnax
bf0ae5e1ee Dsplay on account selection box the headshot image 2023-04-14 23:19:47 +02:00
csoler
02ad585c2c
Merge pull request #2701 from PYRET1C/browse_image 
This PR adds a browse button for the wire for image addition functionality.
 2023-04-14 14:18:23 +02:00
PYRET1C
b543281bb3 this commit changed the QFileDialog::getOpenFileName to misc::getOpenFileName 2023-04-14 17:24:37 +05:30
PYRET1C
df8e6b9f96 Revert "this commit changed the QFileDialog::getOpenFileName to misc::getOpenFileName" 
This reverts commit 5fae434f03d5e4eccb0abbf0573e40006cac9a00.
 2023-04-14 17:21:45 +05:30
PYRET1C
5fae434f03 this commit changed the QFileDialog::getOpenFileName to misc::getOpenFileName 2023-04-14 17:19:32 +05:30
csoler
1ff68e097c
Merge pull request #2696 from defnax/toastersettings 
moved popup settings for toasters
 2023-04-14 09:50:57 +02:00
csoler
29c66b91e1
Merge pull request #2700 from defnax/pastepicture-boards 
Added paste picture from clipboard feature for picture posts
 2023-04-14 09:13:09 +02:00
csoler
a7b2091bb8 added a waiting cursor when loading a channel 2023-04-13 21:51:37 +02:00
csoler
e786669dc2
Merge pull request #2702 from csoler/v0.6-BugFixing_28 
fixed crash due to calling a method in board item after deletion
 2023-04-13 21:35:40 +02:00
csoler
3c583f6724 fixed crash due to calling a method in board item after deletion 2023-04-12 23:11:45 +02:00
PYRET1C
f06fa656b8 This commit added a browse button the wire for image addition functionality. 2023-04-12 22:32:17 +05:30
defnax
6590a17eb6 Added paste picture from clipboard feature for picture posts 2023-04-11 21:59:00 +02:00
thunder2
c90ea518c5 FeedReader: Fixed embedding of images with https 2023-04-10 21:17:49 +02:00
csoler
2baec2baab
Merge pull request #2699 from PYRET1C/autodownload_size 
Autodownload size
 2023-04-10 16:43:36 +02:00
Tushar Garg
fe92431cb6 This is the UI part of the auto download adjustable size feature. 2023-04-10 07:06:59 +05:30
Tushar Garg
19de7c627b Merge branch 'Auto_download' 2023-04-09 22:12:04 +05:30
Tushar Garg
23dd7270f9 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c390af58449d96f2178d5b4c3de03277e455225c, reversing
changes made to 1553508776059b465e5f4863ef2f30511b4b5b7b.

bad commit needs to be reverted
 2023-04-09 22:07:35 +05:30
Tushar Garg
2fe8bcc8fd Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c390af58449d96f2178d5b4c3de03277e455225c, reversing
changes made to 1553508776059b465e5f4863ef2f30511b4b5b7b.

bad commit needs to be reverted
 2023-04-09 22:03:45 +05:30
Tushar Garg
b3f55c5b51 Revert "Revert "Adeed a new spin box in the gui to track the variable which stores the maximum size limit allowed for autodownload in channels."" 
This reverts commit e89ad86da05b5636303e24bd9d3f3944e592bd2c.

revert the reverted commits
 2023-04-09 18:48:15 +05:30
Tushar Garg
e89ad86da0 Revert "Adeed a new spin box in the gui to track the variable which stores the maximum size limit allowed for autodownload in channels." 
This reverts commit 7dabc1ff9b896943cc8df76aa5e99abdb5368a40.

Forgot to open a new branch
 2023-04-09 18:34:08 +05:30
Tushar Garg
c390af5844 Merge remote-tracking branch 'upstream/master' 2023-04-09 18:21:59 +05:30
Tushar Garg
7dabc1ff9b Adeed a new spin box in the gui to track the variable which stores the maximum size limit allowed for autodownload in channels. 
This spin box was linked to the variable from the p3gxschannel.h file. This spin box has 8GB as it's default value.
 2023-04-09 18:10:16 +05:30
csoler
7299ace57a re-enabled channel debug output 2023-04-08 18:04:22 +02:00
csoler
1553508776
Merge pull request #2697 from thunder2/webui 
Changed path of webui submodule to relative path
 2023-04-08 17:42:05 +02:00
thunder2
05c3f1f6e9 Changed path of webui submodule to relative path 2023-04-07 19:14:05 +02:00
defnax
22a9cf4236 moved popup settings for toasters 2023-04-07 16:23:46 +02:00
csoler
2723022a7e Merge remote-tracking branch 'upstream/master' into v0.6-Channels-001 2023-04-04 16:26:14 +02:00
csoler
e7ff1b15b7
Merge pull request #2694 from csoler/v0.6-BugFixing_27 
fixed bug preventing completed files removal to clear the files counter
 2023-04-03 22:09:32 +02:00
csoler
783a0a586f fixed bug preventing completed files removal to clear the files counter 2023-04-03 22:06:42 +02:00
thunder2
b124222d87 Windows build environment: 
- Fixed download of Tor binaries
- Fixed download of doxygen
- Updated MSYS2 installer
- Changed build of WebUI
 2023-04-02 13:19:59 +02:00
Tushar Garg
4f1bdbca70 commiting changes 2023-04-02 15:22:36 +05:30
csoler
71f87cf839 Merge branch 'v0.6-Channels-001' of github.com:csoler/RetroShare into v0.6-Channels-001 2023-03-31 16:17:08 +02:00
csoler
c81bdd9932 fixed merge 2023-03-31 16:16:13 +02:00
csoler
cccc6d4251
Merge branch 'master' into v0.6-Channels-001 2023-03-31 16:07:10 +02:00
csoler
8475a7424d
Merge pull request #2681 from csoler/v0.6-BugFixing_20 
Attempt at not reloading full channel data at every change (needs PR #81)
 2023-03-30 10:33:38 +02:00
csoler
cc93a6da1a using orange color for unread comment bubble in channel post widget, and fixed the color update when new comment arrives 2023-03-29 20:46:41 +02:00
csoler
48c959c858 fixed bug in setting msg as read 2023-03-27 21:27:07 +02:00
csoler
eb018b2fd0
Merge pull request #2691 from defnax/toaster-fix 
Fixed Toasters
 2023-03-27 21:15:38 +02:00