Commit Graph

12033 Commits

Author SHA1 Message Date
Angela Mazzurco
2360c3c27a Change search icon 2017-06-22 17:44:11 +02:00
Angela Mazzurco
619874816e Add network icon 2017-06-22 17:41:33 +02:00
Angela Mazzurco
e766e7ce0b Add header to sidebar component 2017-06-22 17:32:59 +02:00
Angela Mazzurco
653381e9e2 Style sidebar partialy 2017-06-22 17:05:36 +02:00
Angela Mazzurco
3b05e0a3f1 Add stylesheet for sidebar 2017-06-22 17:04:25 +02:00
Angela Mazzurco
0a087e64ac Create button component 2017-06-22 17:03:47 +02:00
Angela Mazzurco
356d3ab09f Solve bug to get the same index action when stackview is changed without using sidebar 2017-06-22 15:21:09 +02:00
Angela Mazzurco
27593633fc Use Drawer Sidebar instead of menu class to show the menu 2017-06-22 14:46:30 +02:00
csoler
8b901964d7 updated changelog 2017-06-22 09:12:18 +02:00
csoler
c34165e3b7 pushed new changelog to force update of the date... 2017-06-22 09:00:16 +02:00
csoler
8950acc701 Merge pull request #892 from PhenomRetroShare/Add_MoveRelayPageToNetwork
Move Relay setting page to network one.
2017-06-22 00:39:03 +02:00
Phenom
ea8af8acb3 Move Relay setting page to network one. 2017-06-21 18:38:52 +02:00
csoler
8cc82f9d85 Merge pull request #891 from PhenomRetroShare/Fix_MessageToHeight
Fix To, Cc & Bcc height in MessageWidget.
2017-06-21 18:32:51 +02:00
Angela Mazzurco
c2b63a2313 Use contacts cache to show contacts details 2017-06-21 16:31:20 +02:00
Angela Mazzurco
05ca5b482c Create contacts cache 2017-06-21 16:30:48 +02:00
Angela Mazzurco
923c0c6da3 Open contact details on click the area 2017-06-21 15:57:27 +02:00
Angela Mazzurco
1b9a1f5087 Use AvatarOrColorHash 2017-06-21 15:27:01 +02:00
Angela Mazzurco
8adadd67c2 Merge remote-tracking branch 'g1o/qml_app_chat_aesthetic' into qml_app_chat_aesthetic 2017-06-21 15:24:06 +02:00
Angela Mazzurco
f56921b0e3 Set AvatarOrColorHash in components folder 2017-06-21 15:19:20 +02:00
Angela Mazzurco
ca3a0bd2d1 Merge remote-tracking branch g1o/qml_app_identity_avatar into qml_app_chat_aesthetic 2017-06-21 14:56:31 +02:00
csoler
812e606831 fixed changelog for typo 2017-06-21 08:05:17 +02:00
csoler
1f9320c445 updated changelog 2017-06-21 08:05:17 +02:00
csoler
310c848ca5 Merge pull request #890 from G10h4ck/qml_app_identity_avatar
Qml app identity avatar
2017-06-21 07:42:15 +02:00
Phenom
c46c747e04 Fix To, Cc & Bcc height in MessageWidget. 2017-06-21 06:35:48 +02:00
Gioacchino Mazzurco
1d031910cb Created a dedicated component for avatar image 2017-06-20 17:16:27 +02:00
Gioacchino Mazzurco
8c62c2a326 Qml app: show contact avatar in details if available 2017-06-20 15:35:05 +02:00
Gioacchino Mazzurco
b206015e70 libresapi: expose identity avatar in JSON API
The avatar is sent as a base64 string

The solution is not optimal but is the best we can do inside a JSON and
it's acceptable for the moment
2017-06-20 15:33:28 +02:00
Gioacchino Mazzurco
1f1e830f01 Added Qt SVG module dependency 2017-06-19 18:03:07 +02:00
csoler
0133be757a Merge pull request #887 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-06-17 23:07:10 +02:00
csoler
12a45294a3 added ifdef for comments on GxsTrans 2017-06-17 23:02:28 +02:00
csoler
eb4bb5be65 fixed bug in gxs trans stats counting 2017-06-17 21:42:00 +02:00
csoler
43dcddce67 Merge pull request #880 from PhenomRetroShare/Add_GxsCircleNotify
Add Circle Feed Item.
2017-06-16 12:37:09 +02:00
csoler
a29bc4408e Merge pull request #874 from G10h4ck/silent_initiate_distant_chat_api
libresapi: silent /chat/initiate_distant_chat
2017-06-16 12:24:45 +02:00
csoler
12eed8ef79 Merge pull request #884 from sehraf/pr-fix-bob-settings
fix bug in BOB settings
2017-06-16 12:22:57 +02:00
csoler
25565a7ecd merged upstream/master 2017-06-15 23:58:29 +02:00
csoler
6633b04a44 changed constants for GxsTransport anti-spam 2017-06-15 23:57:02 +02:00
csoler
26bb865d29 added code to reject messages based on existing per-user statistics 2017-06-15 19:32:31 +02:00
sehraf
65ab68b4f7 fix stop button being wrongly disabled 2017-06-15 07:22:33 +02:00
sehraf
fe5ec8bda8 reduce BOB log level 2017-06-15 07:06:52 +02:00
csoler
09ff94c9ec added new virtual method to refuse incoming msgs (similar to groups) in RsGenExchange, and used it in p3GxsTrans to refuse msgs from peers who send too much 2017-06-14 23:19:52 +02:00
Angela Mazzurco
2f853828eb Merge branch 'qml_app_chat_aesthetic' of https://gitlab.com/angesoc/RetroShare into qml_app_chat_aesthetic 2017-06-13 15:27:43 +02:00
Angela Mazzurco
88d170066c Change chat style sheet to a more apropiate name 2017-06-13 15:25:31 +02:00
Angela Mazzurco
9f26a0aec5 Change to Almman indent style 2017-06-13 15:24:36 +02:00
Angela Mazzurco
7c6638f4e9 Change to Almman indent style 2017-06-13 14:51:53 +02:00
Angela Mazzurco
4b05555a5c Change version of QtQml to 2.3 2017-06-13 14:43:25 +02:00
Angela Mazzurco
0a9c29f0b9 Solve bug with undefined props in lastMessage object 2017-06-13 14:40:05 +02:00
Angela Mazzurco
dc02fe034e Add left margin to toolbar 2017-06-13 14:24:07 +02:00
csoler
c451d3a12c Merge pull request #873 from RetroPooh/tunnstats
stats tunnels rearranged columns for better readablilty
2017-06-12 22:18:34 +02:00
csoler
1e7feecdf0 Merge pull request #882 from topcat/iss879
Included QStringList header in ApiServerLocal.cpp [Issue 879]
2017-06-12 22:16:46 +02:00
csoler
79825eb2e2 fixed thread issue in RsGxsCleanupThread that caused random crashes 2017-06-12 20:36:02 +02:00