Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 07:47:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,073 Commits 63 Branches 22 Tags
Commit Graph

13073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
5ee86262aa fixed compilation 2019-03-29 09:17:32 +01:00
csoler
da57f80095
Merge pull request #1506 from defnax/subscribe-button-with-count 
Count subscribers on the channels subscribe button like Youtube
 2019-03-28 20:04:52 +01:00
csoler
8b3f3fe717
Merge pull request #1487 from defnax2k/People-V2-improvements 
Added more actions to People V2 Thumbed View
 2019-03-28 19:59:59 +01:00
defnax
c2ebd10aa6 Count subscribers on the channels subscribe button like Youtube 2019-03-27 19:33:10 +01:00
G10h4ck
72e0a9607b
Merge pull request #1491 from hunbernd/fix/jsonapi 
Fix jsonapi compilation
 2019-03-27 10:23:45 +01:00
hunbernd
d2d336ee01 Made the restbed compile command better 2019-03-26 20:54:36 +01:00
csoler
c7e65a0111
Merge pull request #1504 from csoler/v0.6-ImprovedGUI 
removed explicit size on channel feed buttons that causes unbalanced …
 2019-03-24 20:42:11 +01:00
csoler
e76ad99f3b
removed explicit size on channel feed buttons that causes unbalanced items in high DPI screens 2019-03-24 19:59:43 +01:00
csoler
ec66ad5b80
Merge pull request #1501 from csoler/v0.6-ImprovedGUI 
created a cache for default icons to avoid allocating them everytime …
 2019-03-24 19:49:36 +01:00
csoler
db4f8f18b8
fixed sqlcipher version on OS 10.14 2019-03-24 18:58:18 +01:00
csoler
1d09269e42
switched macOS version to 10.14 2019-03-24 16:22:17 +01:00
csoler
e6d86b5b6f
switched macOS version to 10.14 2019-03-24 16:20:12 +01:00
csoler
63ca76167b
removed brew-doctor command 2019-03-24 13:04:23 +01:00
csoler
32729adb5e
attempt #2 to fix MacOS compilation 2019-03-24 12:56:43 +01:00
csoler
364c3917ac
attempt to fix MacOS compilation 2019-03-23 23:48:39 +01:00
csoler
2ad641d908
added a test for QImage::isDetached() in cache to solve the problem of whether a cache image is still used or not 2019-03-23 22:59:37 +01:00
G10h4ck
f4e13975b0
Merge pull request #1478 from G10h4ck/jsonapi 
extend JSON API to identities, circles and reputation
 2019-03-23 09:11:05 -03:00
defnax
da505e0426
Merge pull request #8 from RetroShare/master 
Split OBS recipes into submodule
 2019-03-21 23:55:10 +01:00
csoler
ae3f81a0c3
created a cache for default icons to avoid allocating them everytime we need them. Should save a lot of memory 2019-03-21 23:36:18 +01:00
Gioacchino Mazzurco
b388726dab
Split OBS recipes into submodule 
This is mainly to avoid problems with source checkout on windows because
network:retroshare which is the name needed by OBS is proibited (:) on
windows FS
 2019-03-21 23:10:24 +01:00
defnax
300e4f0626
Merge pull request #7 from RetroShare/master 
update master
 2019-03-21 14:02:38 +01:00
csoler
431fbf4124
fixed bug causing ipossibility to pin/unpin forum posts 2019-03-20 23:23:13 +01:00
csoler
07abdeeceb
fixed bug causing distant chat preference contacts/nobody/everybody to be ignored 2019-03-20 22:34:48 +01:00
defnax
2233af4702
Merge branch 'Attach-picture-for-Posted-links' into master 2019-03-20 11:01:21 +01:00
defnax
f12491cc89 attempting to fix stlysheet file 2019-03-20 00:49:38 +01:00
csoler
450fcbb0e7
Merge pull request #1459 from defnax/master 
Improved Posted Links & Subscribe button look like Youtube/Reddit style
 2019-03-19 23:44:14 +01:00
defnax
c7e4986710 fixed serialization of posts with images 
fix by cyril
 2019-03-19 23:23:49 +01:00
csoler
8f953c0e3c
Merge pull request #1492 from shibe2/patch-1 
remove accidental code from retroshare_plugin.pri
 2019-03-18 21:00:05 +01:00
csoler
c4f951fe5e
Merge pull request #1480 from chelovechishko/rspmw 
rspermissionmatrixwidget fixes
 2019-03-18 20:57:17 +01:00
csoler
af0ce1013f
Merge pull request #1494 from csoler/v0.6-FT 
set default FT rate to some non zero value. Should start transfers faster. Needs testing!
 2019-03-17 21:39:37 +01:00
hunbernd
bc294b207d Fixed parallel compilation of librestbed 2019-03-16 17:26:27 +01:00
hunbernd
a4ee76e402 Fixed some dependency issues 2019-03-16 16:36:54 +01:00
shibe2
d210795c5e
remove accidental code from retroshare_plugin.pri 2019-03-10 12:48:36 +04:00
hunbernd
5df54d7630 Converted extra targets into an extra compiler: 
- Multi core compilation works correctly
 - The jsonapi header files are regenerated when there are changes in libretroshare interface files
 2019-03-10 01:49:47 +01:00
hunbernd
bbb15fd960 Fixed jsonapi generator: 
- Doxygen failed, because it got Unix like paths on Windows
- Josnapi generator created empty output files, because multiple _ in input file names
 2019-03-09 20:49:54 +01:00
hunbernd
294d711cc3 Fixed restbed compilation on Windows 2019-03-09 20:38:33 +01:00
csoler
9d629254ff
set default FT rate to some non zero value. Should start transfers faster. Needs testing. 2019-03-08 17:12:46 +01:00
defnax
bdf8d68c34 Added more actions to People V2 Thumbed View 
Added action for send invite
Added action for add to contacts
Added action for person details view
Added menu for circles
Added to display votes on Identity widget
 2019-02-25 20:23:47 +01:00
chelovechishko
32e18c7f71 gui: rspermissionmatrixwidget: draw permission popup to the left 
of the cursor instead of beyond the edge of screen
 2019-02-18 20:53:36 +09:00
G10h4ck
54899f8378
Merge pull request #1477 from PhenomRetroShare/Fix_ClangWarnings 
Fix clang warnings
 2019-02-17 11:11:20 -03:00
chelovechishko
209e1541ff gui: rspermissionmatrixwidget: use define for qt::black 2019-02-17 18:36:09 +09:00
Gioacchino Mazzurco
9e70aa0a98
Fix compile error on OSX 2019-02-16 17:09:35 -03:00
Gioacchino Mazzurco
5ff4ebbd12
Fix retroshare-gui compilation after RsReputations refactoring 2019-02-16 11:42:22 -03:00
Gioacchino Mazzurco
a6e8a27fc0
Add RsReputations JSON API 2019-02-16 11:41:31 -03:00
chelovechishko
55ff018166 gui: rspermissionmatrixwidget: fix name.length check with proper number 2019-02-16 23:32:00 +09:00
Gioacchino Mazzurco
ea7773f86d
Refactor RsReputations for compatibility with JSON API 2019-02-15 15:29:36 -03:00
Gioacchino Mazzurco
cca8a666c3
Merge branch '0.6.5' 
Merge OBS recipes improvements
 2019-02-15 08:57:23 -03:00
Phenom
4c50d73668 Add Compil Flag -Wno-inconsistent-missing-override to hide this type of 
warnings:

../../../trunk/libretroshare/src/services/p3idservice.h:226:24: warning:
'getServiceInfo' overrides a member function but is not marked
'override' [-Winconsistent-missing-override]
        virtual RsServiceInfo getServiceInfo();
                              ^
../../../trunk/libretroshare/src/gxs/rsgenexchange.h:122:27: note:
overridden virtual function is here
    virtual RsServiceInfo getServiceInfo() = 0;
                          ^
 2019-02-15 00:14:42 +01:00
Phenom
1e65089930 Fix Warnings for class 'RsGxsChannelPost' was previously declared as a 
struct

In file included from ../../../trunk/retroshare-gui/src/gui/gxschannels/
GxsChannelPostsWidget.cpp:27:
In file included from temp/ui/ui_GxsChannelPostsWidget.h:31:
../../../trunk/retroshare-gui/src/gui/gxschannels/
GxsChannelFilesWidget.h:28:1: warning: class 'RsGxsChannelPost' was
previously declared as a struct [-Wmismatched-tags]
class RsGxsChannelPost;
^
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:65:8: note:
previous use is here
struct RsGxsChannelPost : RsSerializable
       ^
../../../trunk/retroshare-gui/src/gui/gxschannels/
GxsChannelFilesWidget.h:28:1: note: did you mean struct here?
class RsGxsChannelPost;
^~~~~
struct
 2019-02-15 00:06:48 +01:00
Phenom
bb01198772 Fix Warnings for 'ForumModelPostEntry' defined as a struct here but 
previously declared as a class

In file included from ../../../trunk/retroshare-gui/src/gui/gxsforums/
GxsForumThreadWidget.cpp:31:
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.h:34:1:
warning: 'ForumModelPostEntry' defined as a struct here but previously
declared as a class [-Wmismatched-tags]
struct ForumModelPostEntry
^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h:
39:1: note: did you mean struct here?
class ForumModelPostEntry;
^~~~~
struct
 2019-02-15 00:04:00 +01:00