Commit Graph

9309 Commits

Author SHA1 Message Date
electron128
a118870db9 if file in friends file list is available locally or is being downloaded, then show it in red like in search.
The color is hardcoded, because it is not possible to style arbitrary QObjects with stylesheets.
closes #195
2016-01-09 12:01:32 +01:00
zeners
4c66bb87bb webui: layout improvements 2016-01-09 11:54:01 +01:00
Cyril Soler
9f4256cd00 Merge pull request #244 from csoler/v0.6-Messaging
disabled part of msg re-sending code in order to improve it later
2016-01-08 23:19:45 -05:00
csoler
fe02167ad7 disabled part of msg re-sending code in order to improve it later 2016-01-08 23:18:45 -05:00
Cyril Soler
56a844b58d Merge pull request #243 from csoler/v0.6-Messaging
V0.6 messaging
2016-01-08 23:08:14 -05:00
csoler
a540ffd9a2 removed two debug outputs from MessageDialog 2016-01-08 22:52:01 -05:00
csoler
3f6964bb8b added back messages to sent box 2016-01-08 22:50:03 -05:00
csoler
75edb46c99 added auto-resend of unsent messages. Fixed display of From field in outbox 2016-01-08 20:48:47 -05:00
zeners
c9d6cb6a07 webui: search, download of download working, .gitignore: added linux compile + log files 2016-01-08 22:16:06 +01:00
csoler
0c591f08ae added auto re-send of distant messages after global router notified the message cannot be sent. Added a map n p3msgService to avoid receiving multiple times the same message. 2016-01-07 22:22:05 -05:00
csoler
9651f430d5 fixed wrong usage of local client ids in global router causing distant messages to stay in outbox forever. 2016-01-07 21:01:50 -05:00
zeners
7413b32e2d Merge branch 'master' into webui 2016-01-07 21:02:44 +01:00
zeners
b430cba806 webui: download prototype 2016-01-07 21:00:57 +01:00
defnax
81e2a597e9 Fixing People Margins
Update emotes file
2016-01-07 19:25:52 +01:00
csoler
4484b08b50 cleaned up the problem of outgoing messages being shown with the from from field. 2016-01-07 00:04:52 -05:00
csoler
3d6fa0cf8d fixed bug causing turtle to keep asking for a tunnel after a distant chat is closed if not connected 2016-01-06 18:38:27 -05:00
csoler
61f8e73c36 improved text of warning against pasting pgp keys in connect wizard 2016-01-06 18:12:15 -05:00
csoler
984ce2d3ad removed circles tab from IdDialog. Came from a difficult manual merging between dos and unix encoded files 2016-01-06 18:07:20 -05:00
zeners
a5aa997947 webui: using m.route() 2016-01-06 22:20:32 +01:00
Cyril Soler
7da2ad14ec re-enabled previously disabled code in rsgxsnetservice, that proved useful 2016-01-06 10:31:59 -05:00
csoler
6398b7b9d6 added comment in rsgxsnetservice.cc 2016-01-05 23:00:26 -05:00
csoler
3fa8d863b5 removed time-stamp-ing of messages on client side in locked_genReqMsgTransaction() as it is already handled when receiving messages, and the need to stamp non subscribed groups is not justified anymore 2016-01-05 22:53:56 -05:00
csoler
678afe7a0f fixed stupid mistake in previous commit (GXS transaction timestamp) 2016-01-05 22:27:00 -05:00
zeners
408f379db8 webui: requesthandling improved
- shutdown-detecting
- waiting for password
- requestFail available
- thennables for requests and cache
- req.request method selectable, default POST
2016-01-06 01:45:01 +01:00
csoler
7b3fd53bb9 added correct timestamp in msg list response items for GXS. To be tested. 2016-01-05 19:24:40 -05:00
zeners
2f94f416ba Merge branch 'master' into webui 2016-01-05 21:31:06 +01:00
Cyril Soler
141f0927e3 added tooltip and fixed text in connect friend dialog 2016-01-05 14:22:38 -05:00
zeners
62ee95e706 webui: splitting rs() into rs() and rs.request() 2016-01-05 20:01:47 +01:00
defnax
496546e8ca Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-01-05 18:25:44 +01:00
defnax
19011ba002 clean up emotes, removed some unused.
changed icons for emotes button.
reduze the size of the emoticons
2016-01-05 18:23:43 +01:00
Cyril Soler
9fd0fc54cc fixed bandwidth measurement in pqistreamer 2016-01-05 11:44:05 -05:00
defnax
e6cd4a4c55 Merge pull request #240 from sehraf/pr-smiley-whitespace
Add whitespaces around smileys.
2016-01-05 16:09:14 +01:00
sehraf
54f9912c32 Add whitespaces around smileys.
Only replace smileys with an image when they are surrounded by whitespaces.
This fixes smileys in links and other text that happen to include the sequence for a smiley.
2016-01-05 15:01:22 +01:00
csoler
f1f111f096 merged 2016-01-04 20:05:44 -05:00
Bogdan Cristea
e04b9334e0 corrected compilation inst on openSUSE 2016-01-04 15:25:22 +02:00
electron128
03e2a18be1 added readme and todo 2016-01-04 11:14:10 +01:00
electron128
fd12b25cdd webui: make login work 2016-01-04 10:24:31 +01:00
zeners
c7cbd257a5 Merge branch 'master' into webui 2016-01-03 23:54:56 +01:00
zeners
d60fcfec3d webui: adding prototype for main, accountselect, menu 2016-01-03 23:40:57 +01:00
csoler
9f7af84347 added debug output for encryption/decryption of transactions 2016-01-03 17:33:14 -05:00
csoler
fddc008951 merged with origin 2016-01-03 17:31:22 -05:00
Cyril Soler
3d5042b8f4 Merge pull request #237 from G10h4ck/master
p3ServiceControl: Optimize checkFilter(...), solve memory leak removi…
2016-01-03 14:29:33 -05:00
Gio
05fd33b87e p3ServiceControl: Optimize checkFilter(...), solve memory leak removing mSerialiser, code cleanup 2016-01-03 20:04:06 +01:00
electron128
ddbf7c8fa2 mithril-webui: make automatic update work 2016-01-03 17:25:14 +01:00
electron128
ddd91e228a initial commit of retroshare backend for mithril webui 2016-01-03 16:34:03 +01:00
electron128
bb51e62387 mark empty list as list in libresapi statetokenserver 2016-01-03 16:33:09 +01:00
csoler
1082a8d19a updated ubuntu changelog 2016-01-02 18:59:05 -05:00
electron128
363c4e0b14 started mithril.js based webui 2016-01-02 15:52:17 +01:00
electron128
4953324a3c Merge pull request #235 from PhenomRetroShare/Fix_MakeMACOS_PluginWorking
Make Plugin working in Mac OSX.
2016-01-02 14:53:24 +01:00
Phenom
c5e6f62382 Make Plugin working in Mac OSX. 2016-01-02 14:19:53 +01:00