Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,275 Commits 63 Branches 22 Tags 196 MiB
e132ce7072
Commit Graph

6589 Commits

Author SHA1 Message Date
csoler
e132ce7072
attempt to add SSL-only friends in FriendList - does not work yet 2019-06-20 23:09:40 +02:00
csoler
6114d97c36
removed CIRCLES-related dead code from friendlist 2019-06-20 22:07:08 +02:00
csoler
57a548531c
fixed adding friend with short invite 2019-06-10 15:15:15 +02:00
csoler
38434f2d55
removed unused Cert page from ConnectFriendWizard 2019-06-10 00:38:11 +02:00
csoler
1f56ef310a
removed unused Cert page from ConnectFriendWizard 2019-06-10 00:37:13 +02:00
csoler
a04079daa0
removed unused Cert page from ConnectFriendWizard 2019-06-10 00:36:40 +02:00
csoler
a55e8241ed
removed unused FriendRequest page from ConnectFriendWizard 2019-06-10 00:29:22 +02:00
csoler
c0436b781c
removed unused Email page from ConnectFriendWizard 2019-06-10 00:22:57 +02:00
csoler
0c510a55e9
removed unused RsId and Fof pages from ConnectFriendWizard 2019-06-10 00:20:01 +02:00
csoler
6294aefc6d
removed unused intro page from ConnectFriendWizard 2019-06-10 00:12:20 +02:00
csoler
a7141cbf69
removed unused startWizard and loadCert code in HomePage 2019-06-10 00:03:07 +02:00
csoler
fb52f6717c
fixed up addign friend from short invite 2019-06-09 23:49:31 +02:00
csoler
4bd5aaa9b2
added parsing of short invites in connect friend wizard (not working yet) 2019-06-09 15:03:48 +02:00
csoler
3a799bae37
added optional display of short invites in places with certificates 2019-06-06 21:41:38 +02:00
defnax
37c117cb9e
Merge pull request #1566 from defnax/darkstyle-v2 
added new qdarkstyle version 2.6.8

new additional dark stylsheet for RetroShare.
 2019-05-18 22:16:57 +02:00
defnax
7e6dd9aed7 added new qdarkstyle version 2.6.8 
added new version of qdarkstyle to retroshare
 2019-05-16 23:55:49 +02:00
csoler
6a18e242bb
added compile option to use sanitizer and already fixed a few misalignment errors with it 2019-05-11 22:25:02 +02:00
defnax
eade6a8886
Merge pull request #1551 from defnax/country-emojis 
Added country emojis
 2019-05-06 17:14:35 +02:00
defnax
3457f6e2f1 Added country emojis 2019-05-01 16:12:43 +02:00
Phenom
bdce8e6d31 Fix Relative URL in QSS files. 
As qss files are read and added as plaintext, url() cannot find relative
path.
Using "url(%THISPATH%/" will be replaced by current file path.
 2019-04-26 19:26:49 +02:00
csoler
a4d7b0299b
Merge pull request #1542 from defnax/darkstylesheet-fixes 
Darkstylesheet fixes
 2019-04-25 20:36:12 +02:00
defnax
dcc2cd5cfa added changes for the subscribe button 2019-04-24 21:28:42 +02:00
defnax
036f741beb darkstyle fixes, some urls to images was wrong 2019-04-24 21:17:10 +02:00
G10h4ck
9102a698e4
Merge branch 'master' into Fix_ClangWarnings 2019-04-23 12:45:33 +02:00
csoler
bc8adb74c4
Merge pull request #1502 from defnax/added-group-icons-for-posted-links 
Added group icons for posted links
 2019-04-18 21:56:07 +02:00
defnax
7c534d50ea removed posted links related font-size from qss file 
removed posted links related font-size from qss file
 2019-04-16 19:38:13 +02:00
csoler
0bcbe14b2c
fixed wrong display of trash messages in inbox 2019-04-14 16:25:26 +02:00
csoler
64fecf42f4
moved MessagesDialog.* to msgs/ 2019-04-14 15:50:25 +02:00
zapek
e9f341908a Moved the 'Mark as bad' entry in the search result files context menu 
further down away from 'Download' to avoid accidental clicks
 2019-04-11 11:27:43 +02:00
G10h4ck
276328dd91
Merge pull request #1512 from G10h4ck/csoler-jsonapi-channel 
Improve GxsChannels API
 2019-04-11 10:13:52 +02:00
csoler
43a5312194
Merge pull request #1509 from RetroPooh/trafcount 
display session traffic
 2019-04-10 21:04:53 +02:00
csoler
b128407159 fixed rare bug in chat notify that appeared when your nickname is happenned at the end of the text 2019-04-08 14:33:14 +02:00
csoler
61aeae67ea
disable auto-ban identities for own IDs 2019-04-04 22:52:25 +02:00
csoler
db9d202ab7
fixed missign read-only flag on identity info display 2019-04-04 22:41:02 +02:00
Phenom
5cb5954882 Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
1266:13: warning: function 'recursPrintModel' is not needed and will not
be emitted [-Wunneeded-internal-declaration]
static void recursPrintModel(const std::vector<ForumModelPostEntry>&
entries,ForumModelIndex index,int depth)
            ^
 2019-04-04 21:20:25 +02:00
Phenom
d96b9b054b Fix clang warnings for 
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
106:53: warning: unused parameter 'parent' [-Wunused-parameter]
int RsGxsForumModel::columnCount(const QModelIndex &parent) const
                                                    ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:245:3:
warning: add explicit braces to avoid dangling else [-Wdangling-else]
                else
                ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
248:12: warning: comparison of integers of different signs: 'int' and
'std::vector::size_type' (aka 'unsigned long') [-Wsign-compare]
    if(row >= mPosts[entry].mChildren.size())
       ~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
299:67: warning: unused parameter 'orientation' [-Wunused-parameter]
QVariant RsGxsForumModel::headerData(int section, Qt::Orientation
orientation, int role) const
                                                                  ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
398:77: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::textColorRole(const ForumModelPostEntry&
fmpe,int column) const
                                                                            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
419:74: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::filterRole(const ForumModelPostEntry& fmpe,int
column) const
                                                                         ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
498:75: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::missingRole(const ForumModelPostEntry&
fmpe,int column) const
                                                                          ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
540:74: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::pinnedRole(const ForumModelPostEntry& fmpe,int
column) const
                                                                         ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
548:78: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::backgroundRole(const ForumModelPostEntry&
fmpe,int column) const
                                                                             ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
806:111: warning: unused parameter 'useChildTS' [-Wunused-parameter]
void RsGxsForumModel::convertMsgToPostEntry(const RsGxsForumGroup&
mForumGroup,const RsMsgMetaData& msg, bool useChildTS,
ForumModelPostEntry& fentry)
                                                                                                              ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:828:7:
warning: unused variable 'redacted' [-Wunused-variable]
        bool redacted = false;
             ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:880:6:
warning: unused variable 'pos' [-Wunused-variable]
        int pos = 0;
            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:879:6:
warning: unused variable 'count' [-Wunused-variable]
        int count = msgs.size();
            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:882:6:
warning: unused variable 'step' [-Wunused-variable]
        int step = 0;
            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
949:26: warning: comparison of integers of different signs: 'int32_t'
(aka 'int') and 'std::vector::size_type' (aka 'unsigned long') [-Wsign-
compare]
        for(int32_t i=0;i<v.size();++i)
                        ~^~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
959:23: warning: comparison of integers of different signs: 'int32_t'
(aka 'int') and 'std::vector::size_type' (aka 'unsigned long') [-Wsign-
compare]
                                        for(int32_t j=0;j<it2-
>second.size();++j)
                                                        ~^~~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
991:26: warning: comparison of integers of different signs: 'int32_t'
(aka 'int') and 'std::vector::size_type' (aka 'unsigned long') [-Wsign-
compare]
        for(int32_t i=1;i<it->second.size();++i)
                        ~^~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
1005:22: warning: comparison of integers of different signs: 'int' and
'std::vector::size_type' (aka 'unsigned long') [-Wsign-compare]
        for(int i=1;i<it->second.size();++i)
                    ~^~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/
GxsForumThreadWidget.cpp:1038:13: warning: unused function
'cleanupItems' [-Wunused-function]
static void cleanupItems (QList<QTreeWidgetItem *> &items)
            ^
 2019-04-04 21:20:25 +02:00
Phenom
07a31ee5f5 Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/People/IdentityWidget.cpp:111:10:
warning: explicitly assigning value of variable of type 'QImage' to
itself [-Wself-assign-overloaded]
                        image = image;
                        ~~~~~ ^ ~~~~~
 2019-04-04 21:20:25 +02:00
Phenom
9310be075d Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/Posted/PostedDialog.cpp:99:10:
warning: enumeration value 'ICON_SEARCH' not handled in switch [-
Wswitch]
        switch (type) {
                ^
 2019-04-04 21:20:25 +02:00
Phenom
e2d64c912e Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp:
1104:9: warning: enumeration value 'DownloadTab' not handled in switch
[-Wswitch]
        switch(page)
               ^
 2019-04-04 21:20:25 +02:00
Phenom
4bf5bc1274 Fix clang warnings for 
../../../trunk/libretroshare/src/services/autoproxy/
rsautoproxymonitor.cc:263:24: warning: pragma diagnostic pop could not
pop, no matching push [-Wunknown-pragmas]
                       ^
../../../trunk/libretroshare/src/services/autoproxy/
rsautoproxymonitor.cc:295:24: warning: pragma diagnostic pop could not
pop, no matching push [-Wunknown-pragmas]
                       ^
./../../trunk/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp:
723: warning: pragma diagnostic pop could not pop, no matching push [-
Wunknown-pragmas]
                       ^
 2019-04-04 21:06:01 +02:00
RetroPooh
7504964899 display session traffic 2019-04-03 17:29:13 +03:00
csoler
e0af46eb85
added new method to create a channel with more explicit parameters and JSon API for it 2019-03-30 22:53:14 +01:00
csoler
ef1755d97f
Merge pull request #1493 from csoler/v0.6-Messaging 
V0.6 messaging
 2019-03-29 22:27:27 +01:00
csoler
5ee86262aa fixed compilation 2019-03-29 09:17:32 +01:00
defnax
a1ca31afa0 fixes from cyril & removed stylesheets from some buttons 
fixed size of thumbnail on all screens
fixed aspect ratio
removede the stylsheet for comments,share, notes
 2019-03-29 02:00:13 +01:00
csoler
031a717de0
moved column resize after procesSettings() 2019-03-28 20:06: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
94997bd0d3 Added infoframe for Posted List Widget 
* Added infoframe for Posted List Widget
* Fixed channels infoframe look both same
 2019-03-28 02:00:42 +01:00
defnax
c2ebd10aa6 Count subscribers on the channels subscribe button like Youtube 2019-03-27 19:33:10 +01:00