Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,222 Commits 63 Branches 22 Tags 194 MiB
cfe44be128
Commit Graph

11222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angela Mazzurco
667b4b3e4c Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-II 2017-07-22 19:55:41 +02:00
Angela Mazzurco
b867e66fa9 Fix button when image scaled is to big 2017-07-22 19:51:54 +02:00
Angela Mazzurco
ab46c8d457 Refactor to use custom buttons 2017-07-22 19:51:32 +02:00
Angela Mazzurco
2ef2342363 Style view 2017-07-22 19:40:02 +02:00
Angela Mazzurco
31d8cdf943 Add necessary icons 2017-07-22 19:39:37 +02:00
Angela Mazzurco
03cd80f5ad Style buttons 2017-07-22 19:11:56 +02:00
Angela Mazzurco
753032e5e8 Add necessary icons 2017-07-22 19:05:36 +02:00
Angela Mazzurco
4df10e3c69 Style buttons 2017-07-22 18:40:09 +02:00
Angela Mazzurco
20b2de59c5 Proper way to handle cancel signal to go back 2017-07-22 18:28:41 +02:00
Angela Mazzurco
cd809165db Add icons 2017-07-22 18:27:15 +02:00
Angela Mazzurco
201ffcedd8 Add options icon 2017-07-22 17:56:11 +02:00
Angela Mazzurco
adb3b0fc39 Style bottom button 2017-07-22 17:44:51 +02:00
Angela Mazzurco
18d29310d3 Style location list view 2017-07-22 17:41:40 +02:00
Angela Mazzurco
1ee655978c Merge branch 'qml_app_style_buttons' into qml_app_ui_improvements 2017-07-22 17:32:04 +02:00
Angela Mazzurco
e82a94673d Fix width when icon is set 2017-07-22 17:17:17 +02:00
Angela Mazzurco
9edccf8cc4 Add default border radius to buttons 2017-07-22 16:31:31 +02:00
Angela Mazzurco
0a3a8272b4 Set disabled button colors 2017-07-22 16:27:11 +02:00
Angela Mazzurco
e4e3411308 Fix height problem 2017-07-22 16:21:32 +02:00
Angela Mazzurco
4e4c991034 Refactor variable to be more usable 2017-07-22 16:06:36 +02:00
Angela Mazzurco
331b00d5d9 Set default color for buttons 2017-07-22 16:03:49 +02:00
Angela Mazzurco
5138683784 Set button default width and height 2017-07-22 15:54:41 +02:00
Angela Mazzurco
64c48be211 Add cancel button on Locations view to go back to location selector 2017-07-22 15:42:08 +02:00
Angela Mazzurco
962cda0947 Change layout of location selector 2017-07-22 15:32:17 +02:00
Angela Mazzurco
905b1d6556 Refactor button names 2017-07-22 14:44:12 +02:00
Angela Mazzurco
0ca3e35e33 Set a button to open chat from contact details 2017-07-21 18:48:23 +02:00
Angela Mazzurco
c27db173ce Start distant chat using helper on ChatCache 2017-07-21 18:34:44 +02:00
Angela Mazzurco
db0292f6e0 Fix push contactDetails view when click avatar on it 2017-07-21 17:31:19 +02:00
Angela Mazzurco
f77fe533e7 Merge branch 'qml_app_ui_aesthetic' into GSoC2017-evaluation-II 2017-07-19 17:27:18 +02:00
Angela Mazzurco
e369f23bb4 Add link detection on bubbles 2017-07-19 16:56:17 +02:00
Angela Mazzurco
55b0790285 Solve undefined parent width when a new bubble is created 2017-07-19 16:21:08 +02:00
Angela Mazzurco
6f81662428 Merge branch 'qml_app_avatar_picker' into qml_app_ui_aesthetic 2017-07-19 14:59:00 +02:00
Gioacchino Mazzurco
5f0cb3ce5d Merge branch 'qml_app_avatar_picker' into GSoC2017-evaluation-II 2017-07-19 13:33:40 +02:00
Gioacchino Mazzurco
d5c01a3b28 Merge branch 'master' into GSoC2017-evaluation-II 2017-07-19 13:31:29 +02:00
csoler
833787e728 Merge pull request #949 from PhenomRetroShare/Add_AnonIconBeforeName 
Add :/icons/anonymous_blue_128.png before name for unsigned GxsId
 2017-07-18 23:02:54 +02:00
csoler
bb8f93eacc Merge pull request #951 from PhenomRetroShare/Fix_BadServMntorRegister 
Fix Bad Service Monitor registering.
 2017-07-18 21:19:38 +02:00
Angela Mazzurco
25d27b0f7f Disable base64 string debug 2017-07-18 19:27:56 +02:00
Angela Mazzurco
c880f5f783 Reload top face when avatar is changed 2017-07-18 19:26:31 +02:00
Phenom
5bbb99aef7 Fix Bad Service Monitor registering. 
This induce to remove peers in statistics->bandwidth when disc service
is off.
 2017-07-18 19:24:32 +02:00
Angela Mazzurco
3fecbe02a3 Set avatar button on proper position 2017-07-18 18:21:38 +02:00
Angela Mazzurco
875b625abb Scale image before base64 encoding 2017-07-18 18:10:57 +02:00
Angela Mazzurco
938c3109f6 Solve incorrect behaviours on android 2017-07-18 17:05:04 +02:00
Angela Mazzurco
c0d00c8b7c Stringfy correctly the params sent to the api 2017-07-18 16:36:54 +02:00
Angela Mazzurco
d64daa7d49 Change avatar via rsapi 2017-07-18 16:25:38 +02:00
Angela Mazzurco
c570aae9f7 Function to convert an image to a png base64 format 2017-07-18 16:24:56 +02:00
Phenom
b8f742d80c Add :/icons/anonymous_blue_128.png before name for unsigned GxsId 
Unsigned is added to tooltip.
Double click on name is fixed.
 2017-07-18 14:30:31 +02:00
csoler
e56340e0a1 Merge pull request #386 from PhenomRetroShare/Add_AbilityToChangeOpModeInCmdLine 
Add the ability to change OpMode in command line.
 2017-07-17 23:12:06 +02:00
csoler
d39b05ccec Merge pull request #948 from PhenomRetroShare/Add_FilterIdInFriendList 
Add new Filter by ID in FriendList.
 2017-07-17 22:49:44 +02:00
csoler
f4aec11b0a suppressed warning in p3dhtmgr.cc 2017-07-17 22:48:12 +02:00
Phenom
437426429e Fix clang warning: unused variable 'pqiservicezone' 
/libretroshare/src/pqi/pqiservice.cc:30: warning: unused variable
'pqiservicezone' [-Wunused-const-variable]
const int pqiservicezone = 60478;
 2017-07-17 22:35:01 +02:00
Phenom
1f39789f2e Fix clang warning: 'RSGraphWidget::sizeHint' hides overloaded virtual 
function

/retroshare-gui/src/gui/common/RSGraphWidget.h:173: warning:
'RSGraphWidget::sizeHint' hides overloaded virtual function [-
Woverloaded-virtual]
        virtual QSizeF sizeHint( Qt::SizeHint which, const QSizeF &
constraint = QSizeF() ) const;
/usr/include/qt4/QtGui/qframe.h:76: hidden overloaded virtual function
'QFrame::sizeHint' declared here: different number of parameters (0 vs
2)
    QSize sizeHint() const;
 2017-07-17 22:34:32 +02:00