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,445 Commits 63 Branches 22 Tags 194 MiB
130e3d63fa
Commit Graph

304 Commits

Author SHA1 Message Date
Gio
6c6b437db1 qml-app: Fix responsiveness of ChatView 
ChatHandler::handleMessages(...) tick() before repling so the raw
  message queue is processed
ChatHandler::handleLobbies(...) make sure tick() is called without
  previous mutex locking, putting the critical section inside a block
ChatView.qml remove unnecessary request to statetoken service that
  slowed down processing by half, increased chat message refresh time
  to reduce performance hit
 2016-12-10 20:23:30 +01:00
Gio
c3aca0cf26 Implement a working Distant Chat prototype in Qml 
Deprecate id field in JSON API as it may cause problems in Qml
Offer gxs_id field in JSON API as an id alternative
LibresapiLocalClient support callbacks now an instance may be shared for
  different tasks
Expose an instance of LibresapiLocalClient to Qml, type exposure is kept
  for retrocompatibility but deprecated
Qml app now has a tab that permit to exchange some message with selected
  distant peer
 2016-12-08 15:56:23 +01:00
Gio
9eef412b44 Expose libresapi for distant chat 
Added macro to deprecate symbols usage in a crossplatform way.
Deprecated Request::mMethod and related stuff that make implementation
 more complex without advantage.
Added /chat/{initiate_distant_chat, distant_chat_status,
 close_distant_chat} to libresapi.
Solved subtle bug in ChatId::ChatId(std::string str) that caused zeroed
 DistantChatPeerId being created.
 2016-12-07 20:29:33 +01:00
felisucoibi
628177c302 fix for windows compile 2016-11-16 11:22:23 +01:00
cyril soler
de6f753fec fixed compilation due to previous commit 2016-11-15 09:18:51 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
Gio
10ec1144eb Simplify QML to work better on both Desktop and Phone 
- Set request method to GET by default in ApiLocalConnectionHandler to avoid
/peers request fail randomly
- Use TabView instead of SwipeView to not depend on Qt 5.7.0 (latest version)
- AddTrustedNode simplified layout to avoid unexpected behaviour on some phones
- Locations add sslid property to root Item to avoid unexpected behaviour when
multiple locations are available
- TrustedNodesView color connected friends with green and offline with grey
- Ignore kdevelop 4 files
 2016-10-26 20:37:28 +02:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Gio
633a6cf8c2 Fixed a bunch of warnings in safe ways 2016-10-13 00:01:33 +02:00
Gio
cf1c49aa3a Advances on trusted node addings 
ApiServerLocal trim method/path line to avoid white spaces parsing
ApiServerLocal add support for passing METHOD in request
AddTrustedNode.qml add ability to copy and paste keys
 2016-09-22 12:48:08 +02:00
mr-alice
0757fb303c merged upstream/master 2016-09-20 20:51:50 +02:00
mr-alice
a2e34f9cc6 moved regular expression classes into a separate namespace 2016-09-13 12:05:22 +02:00
sehraf
e4bd7f66a0 add dht/nat to librespai stats 2016-08-30 21:58:07 +02:00
sehraf
51c98fdf50 add stats to libresapi 2016-08-30 21:50:20 +02:00
Gio
279551fe8d Retroshare android service now run and start at boot on android, the qml app is still disfunctional 2016-08-23 12:15:28 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
Phenom
275c47eff9 Add Title when ask for password. 2016-08-09 01:22:14 +02:00
Gio
183ac22aba ApiServerLocal run on it's own thread to avoid stopping UI 
ApiLocalConnectionHandler can now handle both buffered (QLocalSocket
based) and unbuffered (like ncat or simple scripts) clients
 2016-08-08 14:23:56 +02:00
Gio
353308e2a5 ApiLocalConnectionHandler class quit() at the end outside if 2016-08-03 14:35:45 +02:00
Gio
e4e29c5adc quit ApiLocalConnectionHandler after replying API query 2016-08-03 00:50:49 +02:00
Gio
7c2e2bd503 take in account that QLocalSocket is of type STREAM so it doesn't emit readyRead event for each write() on the other side 2016-07-28 17:50:00 +02:00
Gio
fe7de83529 WebUI is now optional but enabled by default at compile time 2016-07-28 14:08:49 +02:00
Gio
b5f95cb651 libresapilocal is now optional (enabled by default) 2016-07-15 11:25:31 +02:00
Gio
47414acb62 Basic support to access libresapi via unix socket / windows named pipes 2016-07-15 11:25:31 +02:00
Gio
8e2d4e05ce Fix typo in libresapi documentation 2016-07-01 10:18:42 +02:00
Gio
da4c563223 Fix typo in libresapi documentation 2016-06-30 22:03:22 +02:00
csoler
dbd78d2401 merged with upstream/master 2016-06-16 20:19:03 -04:00
Cyril Soler
f1d69ada82 Merge pull request #351 from PhenomRetroShare/Add_WebUI_ClearButtonOnBradCast 
Add Clear Button on WebUI for BroadCast.
 2016-06-05 11:26:29 -04:00
csoler
f55b283887 second pass over compilation warnings 2016-06-05 11:05:52 -04:00
csoler
927f782bef pass over compiler warnings 2016-06-05 10:43:57 -04:00
sehraf
f16ee97093 add static thread names 2016-06-01 16:21:55 +02:00
sehraf
b3fece25da introduce thread naming 2016-06-01 15:07:41 +02:00
Phenom
07191a7c0b Fix Clear WebAPI when clear chat history in GUI and server is not 
running.
 2016-05-17 16:50:59 +02:00
Phenom
61d2ab5eb3 Fix compilation of LibResAPI for MacOS 2016-05-06 22:12:40 +02:00
zeners
08be19faa9 webui: rebuild files on qmake 
giving up: don't know why build-steps are missed
 2016-05-06 10:29:03 +02:00
zeners
13dec7ab5a webui: reset file-date on touch to force build 2016-05-06 10:06:03 +02:00
zeners
962dd91e0a webui: include files on first clean build 
update website-title to 6
 2016-05-03 19:02:07 +02:00
zeners
0a6ae559fd webui: redefined building webui 
on linux: 'make' don't build libresapi every time anymore,
it now knows when, what and how to 'build' webui

on windows: builds old style
 2016-04-30 14:21:09 +02:00
Phenom
4dd0f591f4 Add Clear Button on WebUI for BroadCast. 2016-04-15 19:08:10 +02:00
Phenom
a18e05d4fd Fix Escaped characters in WebUI. 2016-04-09 21:05:20 +02:00
Cyril Soler
10a32d3c4e Merge pull request #343 from csoler/v0.6-Circles 
V0.6 circles
 2016-04-09 11:38:07 -04:00
Phenom
24b3f0de0e Add a Clear button on WebUI 
And Fix clear history update from GUI.
 2016-04-08 01:31:36 +02:00
csoler
4ad3b11ef5 fixed compiler warning 2016-04-06 22:27:02 -04:00
Phenom
c6f1cc4e63 Clear WebAPI when clear chat history in GUI. 
Move notifyChatCleared call to p3ChatService
To maintain notify direction.
 2016-03-31 22:52:53 +02:00
thunder2
ab78825966 Enabled webui build script for Windows compile 2016-03-31 10:23:23 +02:00
zeners
f570477991 webui: patch init.sh like build.sh 2016-03-30 18:20:59 +02:00
electron128
475cb409c4 Merge pull request #328 from PhenomRetroShare/Fix_WebUI_MakeSrcBuild 
Fix WebUI Make Source build script for LMDE and other using /bin/sh.
 2016-03-29 20:13:24 +02:00
zeners
be328e223e webui: include files in install 2016-03-29 18:57:18 +02:00
thunder2
a53fbad1e4 Fixed Windows compile. 2016-03-29 08:13:28 +02:00
Phenom
d6723c1412 Fix WebUI Make Source build script for LMDE and other using /bin/sh. 2016-03-28 20:54:18 +02:00
zeners
dfa2cba045 webui: menu in gui mode fixed 2016-03-28 13:03:49 +02:00
zeners
bf374b3fa4 webui 4 windows build prepare 
should be testet by someone
 2016-03-28 11:34:33 +02:00
zeners
0482655647 webui: removed searchresult debug output 2016-03-27 20:29:48 +02:00
zeners
bbdb04fd78 webui: searchresult cross-checking with downloads 2016-03-27 20:13:47 +02:00
zeners
3bbd370242 webui: windows creating batch-files 2016-03-27 18:28:32 +02:00
zeners
215402b50f webui: add downloads: focus fixed 2016-03-26 23:36:02 +01:00
zeners
a67c1d7514 webui: paste RS-links for download 2016-03-26 18:19:33 +01:00
zeners
30193fe79a webui: switch from react to mithril 2016-03-24 18:07:21 +01:00
zeners
cef07fff91 webui: integrate new webui in unix build process 2016-03-24 00:33:22 +01:00
zeners
a19a068339 webui: options>settings, playing with colors 2016-03-23 13:11:14 +01:00
zeners
585c43bb25 webui: RS-reboot / RS-reboot-detection improved 
paths without token, are now pulled
 2016-03-22 23:19:36 +01:00
zeners
a069db5ee5 webui: chat: display peer location 2016-03-22 16:37:48 +01:00
zeners
4733523b0c webui: view / change rights per user 2016-03-22 16:33:05 +01:00
zeners
83ff00e77d webui: updated mithril to v0.2.3 
no idea what it was before
 2016-03-22 12:08:23 +01:00
zeners
51e0d83c47 webui: options / rights (only defaults) 2016-03-21 17:04:21 +01:00
zeners
12c0efb006 webui: pgp-linked identity disabled 
reason: password-request don't work
 2016-03-19 17:39:46 +01:00
zeners
1b72d2cec3 webui: unsubscribe chat-lobby 2016-03-12 23:38:39 +01:00
zeners
41a8e53abf webui: chat-layout fixed 2016-03-12 23:28:27 +01:00
zeners
0afa2e3726 webui: unread chat message counter in menu 2016-03-12 20:20:56 +01:00
zeners
e9af1794dd webui: need for master 2016-03-12 19:17:37 +01:00
zeners
b1286f06ed webui: route peer location to chat-lobby 2016-03-12 17:44:43 +01:00
zeners
888e8f5d35 webui: lobby-chat subscribe fixed 2016-02-21 09:38:57 +01:00
zeners
7c121d7792 webui: chat: unread msg count for peer fixed 2016-02-21 09:29:09 +01:00
zeners
f29f1b21af webui: personal chat 2016-02-21 09:14:07 +01:00
zeners
b8a8f34a48 webui: chat: sending messages 2016-02-20 19:37:31 +01:00
zeners
fdb93c3f8d webui: List forums, sort friends 2016-02-20 18:03:27 +01:00
electron128
34957b857a libresapi: added channels/create_post 
group creation acknowledge not implemented yet

usage:
$ curl --data "{\"group_id\":\"<group_id>\",\"subject\":\"just a test\",\"message\":\"test message\"}" http://<host:port>/api/v2/channels/create_post

parameter object:
{
    group_id: required string,
    subject: required string,
    message: required string,
    thumbnail_base64_png: optional string,
    files: optional array of
        {
            name: required string,
            hash: required string,
            size: required number
        }
}
 2016-02-19 19:23:55 +01:00
zeners
c5f127f3b1 webui: contains => match 2016-02-19 18:48:17 +01:00
zeners
288e81c486 webui: full chat display 2016-02-14 19:44:00 +01:00
electron128
2ab755bb5c libresapi: added chat/receive_status 
usage:
$ curl http://<host:port>/localhost:8080/api/v2/chat/receive_status/<chat_id>
 2016-02-14 14:57:41 +01:00
zeners
253182032a webui: chat-channel subscribe 2016-02-13 20:25:31 +01:00
electron128
3d814b7926 libresapi: added chat/send_status 
usage:
$ curl --data "{\"chat_id\":\"<chat_id>\",\"status\":\"Hi there\"}" http://<host:port>/api/v2/chat/send_status
 2016-02-07 14:28:46 +01:00
electron128
2c2c7936e5 libresapi: make list of chat lobby participants available at chat/lobby_participants/<chat_id> 2016-02-07 14:28:46 +01:00
electron128
3a9ff8e1ea fix integer sizing issues in webserver 2016-02-07 14:28:46 +01:00
electron128
116513963f libresapi: added statetoken to identity handler responses 2016-02-07 14:28:45 +01:00
electron128
f4f37cc354 webui: added todo 2016-02-07 14:28:45 +01:00
zeners
57d1d0868a webui: adding and listing identities 2016-01-31 18:16:26 +01:00
electron128
94b02943e6 libresapi: added identity/create_identity 2016-01-31 16:04:34 +01:00
zeners
284e5a9ed0 webui: reorganize counterfnkt 2016-01-31 15:58:20 +01:00
electron128
22afc8e67b libresapi: fix empty peers list 2016-01-31 15:07:25 +01:00
electron128
b649088b20 webui: added todo 2016-01-31 15:07:17 +01:00
zeners
9e1fc59c6e webgui: fixed menu-display 2016-01-31 13:37:55 +01:00
zeners
b2b96c097f webui: small main reorganisation 2016-01-26 11:55:48 +01:00
zeners
2292b7c998 webui: createlogin with import pgp-key 2016-01-24 20:07:22 +01:00
zeners
2fc35cf707 webui: createlogin with new pgpid 2016-01-24 19:32:15 +01:00
zeners
e944ab6045 webui: createlogin for existing pgp-key 2016-01-24 18:03:48 +01:00
zeners
f4c68a1016 webgui: first steps in chat 2016-01-16 20:22:49 +01:00
zeners
b6bb69df7a webui: adding counting feature for menu 2016-01-16 17:25:12 +01:00
zeners
2e41c373b5 webui: add / remove peers 2016-01-12 19:26:04 +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
zeners
4c66bb87bb webui: layout improvements 2016-01-09 11:54:01 +01:00
zeners
c9d6cb6a07 webui: search, download of download working, .gitignore: added linux compile + log files 2016-01-08 22:16:06 +01:00
zeners
b430cba806 webui: download prototype 2016-01-07 21:00:57 +01:00
zeners
a5aa997947 webui: using m.route() 2016-01-06 22:20:32 +01: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
zeners
62ee95e706 webui: splitting rs() into rs() and rs.request() 2016-01-05 20:01:47 +01: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
d60fcfec3d webui: adding prototype for main, accountselect, menu 2016-01-03 23:40:57 +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
electron128
363c4e0b14 started mithril.js based webui 2016-01-02 15:52:17 +01:00
Cyril Soler
f30f71db8e Merge pull request #218 from csoler/v0.6-ContactList 
V0.6 contact list
 2015-12-23 18:07:10 -05:00
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05:00
Phenom
86b559191e Fix MacOSX 10.10 Yosemite Compilation 
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
 2015-12-22 17:27:51 +01:00
electron128
adfa94d237 added missing null check libresapi ApiPluginHandler 2015-12-18 19:05:18 +01:00
electron128
5b63762eef removed useless code which caused lots of ChatId conversation warnings 2015-12-17 18:59:30 +01:00
electron128
f7ab3ad04f allow plugins to integrate into the JSON API 2015-12-15 19:56:49 +01:00
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
electron128
7cd880e1e4 removed member gxs_id from ChatId class, because ChatId now uses tunnel ids stored in distant_chat_id for distant chat. 
reverted naming confusion in in libresapi ChatHandler and fixed author of distant chat messages (distant chat is still unfinished)
 2015-12-05 17:00:57 +01:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
csoler
81ab43beb9 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation 2015-11-30 00:02:44 -05:00
Daniel Løvbrøtte Olsen
8eadba60a3 Fixed a small spelling error 2015-11-24 14:43:09 +01:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
csoler
1de55d8fc5 replaced the few bools in RsIdentityDetail by a set of flags 2015-11-19 21:14:32 -05:00
electron128
8238c822b4 fix integer size issue in ContentTypes.cpp which can lead to an infinite loop 2015-11-08 10:34:31 +01:00
electron128
0a21d92aca Merge pull request #176 from hunbernd/feature/webui-download-enhancements 
Webui download and media streaming enhancements
 2015-11-08 10:23:45 +01:00
hunbernd
0ef9b22a7e Some fixes: 
* using ContentTypes to resolve static files too
* added some default content types, in the case of mime.types file not present
* resolve extensions with upper case letters in them
 2015-11-08 01:52:23 +01:00
hunbernd
b847eea57e Webui: Added video support into MediaPlayerWidget 2015-11-08 00:08:03 +01:00
hunbernd
88e1dc006b Webui: added links on file names 
Browsers can play partial files with built-in player, or save files to disk.
 2015-11-07 02:42:18 +01:00
hunbernd
ce40760791 Added support for all common content-types into MHDFilestreamerHandler 
File extension --> content-type associations are read from mime.types file.
 2015-11-07 02:39:42 +01:00
hunbernd
bdc70c6561 Allow arbitrary name in fstream url after hash. 
/fstream/fileshash/name
Useful for creating file links that contains the original file name.
 2015-11-04 22:02:02 +01:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
electron128
a75cbcd7b3 webui: format time of chat messages 2015-10-13 20:36:00 +02:00
electron128
537c4925b7 libresapi: fixed bug in JSON serialisation of uint32_t, decimal digits had inverse order 2015-10-13 20:35:24 +02:00
electron128
4df3283fcf webui: restored Makefile 2015-10-13 20:27:53 +02:00
Phenom
904ea94f9f Remove (void) 2015-10-02 19:10:54 +02:00
Phenom
986853d058 Add Broadcast in list of lobbies. 
Before you can only write text on it if unread messages are in.
 2015-10-02 18:24:05 +02:00
Phenom
d6ba9a22ad Order in WebUI Lobbies by first: 
auto_subscribe, is_private and then subscribed
 2015-09-25 17:00:50 +02:00
csoler
7293cd3afa updated ubuntu changelog 2015-09-21 22:58:58 -04:00
AsamK
7aad9c12d0 Improve HTML parsing in libresapi 
- Completely ignore content of <style> tags, otherwise CSS declarations
  from newer RS builds are displayed
- Only remove <…> tags if it's really html, to prevent destroying messages
  from other webui users
 2015-09-09 13:36:00 +02:00
AsamK
b8c3c89ae0 Extract getPlainText method 2015-09-09 12:42:41 +02:00
AsamK
66b9557833 Use PKGCONFIG instead of manually specifying LIBS for Linux 
- The advantage is that this method automatically includes additional
  dependencies of LIBS (e.g. libupnp needs -lixml).
- Also if some distribution moves headers to non default locations the
  correct locations get added by PKGCONFIG
 2015-09-06 22:27:22 +02:00
Cyril Soler
6af57f3aea Revert "Fix Windows compilation of libresapi with error:" 2015-09-01 21:03:23 -04:00
Cyril Soler
d2dc8deeaf Merge pull request #66 from AsamK/qmake_improvements_next 
More qmake improvements
 2015-09-01 20:49:57 -04:00
Cyril Soler
1713789917 Merge pull request #72 from PhenomRetroShare/Fix_WinCompil_libresapi_u_int_32_t 
Fix Windows compilation of libresapi with error:
 2015-09-01 20:45:02 -04:00
Phenom
3e68741994 Fix Windows compilation of libresapi with error: 
\libresapi\src\api\ForumHandler.cpp:108: erreur : 'u_int32_t' was not
declared in this scope
                 KeyValueReference<u_int32_t>
vis_msg("visible_msg_count", grp.mMeta.mVisibleMsgCount);
                                   ^
 2015-09-01 22:49:15 +02:00