Commit Graph

8792 Commits

Author SHA1 Message Date
csoler
ed12b7a243 fixed merge 2016-01-13 20:57:03 -05:00
csoler
d2f56a5c53 merged with upstream/master 2016-01-13 20:52:55 -05:00
csoler
fd04f0b3bb updated to upstream/master 2016-01-13 20:27:08 -05:00
csoler
3b18c43d8e removed [dos] LF from rsgxsnetservice (causes merging rampage) 2016-01-13 20:25:18 -05:00
Cyril Soler
086b076477 fixed a few serialisation issues 2016-01-13 12:22:55 -05:00
Cyril Soler
96f3446aa7 added size limit to packet grouping 2016-01-13 11:13:23 -05:00
Cyril Soler
b56881e6d9 fixed windows compilation 2016-01-13 10:23:21 -05:00
Cyril Soler
4916496008 Merge pull request #253 from csoler/v0.6-SecurityReview
V0.6 security review
2016-01-13 10:20:51 -05:00
csoler
2c019d984f added load image option in forum posts when images are to be displayed 2016-01-13 00:39:22 -05:00
csoler
60408b3799 fixed a bug in GRouterGenericDataItem::duplicate() 2016-01-13 00:13:16 -05:00
csoler
2a8fc7fe01 hardened the restriction to image loading to avoid external resources in RSTextBrowser 2016-01-13 00:08:27 -05:00
csoler
d55993d1e4 removed two instances of malloc(0) captured by new rs_malloc funtion 2016-01-12 21:43:04 -05:00
csoler
d13526facd added a new method rs_malloc that checks its arguments and prints a stacktrace on error/weird call. Changed the code everywhere to use this instead of malloc. Removed some mallocs and replaced with RsTemporaryMemory 2016-01-12 21:10:11 -05:00
zeners
2e41c373b5 webui: add / remove peers 2016-01-12 19:26:04 +01:00
csoler
9c6e7dfc13 added checks after mallocs in several files 2016-01-11 23:49:00 -05:00
csoler
46520b0e22 fixed potential integer overflow / Out of bounds read in gxstunnelitems.cc 2016-01-11 20:49:26 -05:00
csoler
8e666fcec3 fixed potential integer overflow / Out of bounds read in rsturtleitems.cc 2016-01-11 20:40:57 -05:00
csoler
6e9d96efd8 fixed potential integer overflow / Out of bounds read in RsVOIPDataItem.cc 2016-01-11 20:26:19 -05:00
csoler
98f0c101b9 fixed potential integer overflow / Out of bounds read in GRouterItems.cc 2016-01-11 19:26:54 -05:00
csoler
3094b52e8f fixed potential integer overflow / Out of bounds read in rsbaseserial.cc. Also added a few more error output. 2016-01-11 19:08:52 -05:00
zeners
5f77719f9c Merge branch 'master' into webui 2016-01-10 21:05:20 +01:00
Dirk Heinrichs
a8a8865391 sqlcipher needs to be compiled with -fPIC on RHEL/Fedora. 2016-01-10 17:00:39 +01:00
Dirk Heinrichs
e401001c71 Switching Debian Stretch builds to QT5. 2016-01-10 16:52:46 +01:00
electron128
8e6998b8d9 removed redundant map _lobby_ids from DistributedChatService.
The same information and more is stored in the _chat_lobbys map.
_lobby_ids is unused since commit 67e1495d9a
2016-01-10 14:34:08 +01:00
electron128
09ed1ea22c removed getVirtualPeerId method from rsmsgs lobby interface.
It is not neccesary anymore to have the virtual peer id exposed to the GUI layer.
2016-01-10 14:22:06 +01:00
electron128
67e1495d9a use ChatId instead of virtual peer id for chat lobby popup. Removed a now unused method from rsmsgs interface and DistributedChatService. 2016-01-10 13:29:40 +01:00
csoler
c3d422ac86 added some tooltips on keys and certificate details 2016-01-09 15:05:02 -05:00
csoler
994bfaf902 updated TODO 2016-01-09 13:54:24 -05:00
zeners
5b5929d23a Merge branch 'master' into webui 2016-01-09 19:10:06 +01:00
zeners
0f3ec80564 webui: peers improved, adding peer prepared 2016-01-09 19:08:45 +01:00
zeners
4a8db15da6 webui: searchdetails and searchlist splitted 2016-01-09 17:39:04 +01:00
Cyril Soler
e01b1a4a21 Merge pull request #245 from csoler/v0.6-Messaging
fixed serialization error (missing call) for received Distant msg hash map
2016-01-09 11:00:57 -05:00
csoler
ee84ab732d fixed serialisation error (missing call) for received Distant msg hash map 2016-01-09 10:58:49 -05:00
electron128
b125cb1f1e fix the bug where a filter is applied in friends file list even if view mode is tree and search box is hidden. Problem was: SharedFilesDialog::FilterItems() is called from multiple places. The check if we should filter or not is now in the filter function itself. 2016-01-09 12:09:43 +01:00
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