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
8,561 Commits 63 Branches 22 Tags 194 MiB
405ecefbf8
Commit Graph

89 Commits

Author SHA1 Message Date
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
thunder2
c3fff39624 Fixed Windows compile 2015-09-01 22:49:08 +02:00
AsamK
b66f466c7a Move all INSTALLS to the subproject they belong to 
Allows installation of for example only retroshare-nogui, without
installing files only relevant for gui

$ qmake
$ make retroshare-nogui
$ make retroshare-nogui-install_subtargets
 2015-08-31 22:49:46 +02:00
AsamK
e135e3441c Create retroshare.pri for common configurations in .pro files 
So far it only contains the default values for installation paths
 2015-08-31 21:09:28 +02:00
electron128
5d4e94c671 libresapi: add basic forum read api (patch from Chozabu) close #32 2015-08-31 19:44:15 +02:00
electron128
d94124a18b webui: allow only whitelisted link protocols to prevent javascript in links 2015-07-31 17:27:26 +02:00
electron128
ff9bf71aa8 improved error message in webui: show full path of file if read failed 2015-07-31 17:27:13 +02:00
electron128
ab25e35861 fix serialisation of floating point numbers in SuperEasyJSON for german locale. JSON expects decimal points, but german locale used comma. 2015-07-31 17:26:41 +02:00
electron128
7a144c231b webui: make link detection work if the message ends with </a> 2015-07-31 17:26:32 +02:00
electron128
a9ef48d133 webui: added chat 2015-07-31 17:26:11 +02:00
electron128
89187bd453 webui: added check for empty avatars and implemented avatar notify callback 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8551 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-24 11:13:53 +00:00
electron128
1eec348734 removed unused variable in TmpBlobStore 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8534 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-19 14:43:04 +00:00
electron128
8049d09f8d added missing initialisation in resource_api::Request 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-18 14:04:28 +00:00
electron128
f7935e3bd7 added missing initialisation in ApiServerMHD 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-18 13:57:54 +00:00
electron128
069d5e1a78 added missing include (thx jolavillette) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-16 15:15:36 +00:00
electron128
8fc3917c4b webui: 
- added profile import/creation
- fixed leaking file descriptors
- added upload handler for small files
- fixed terminal thread
- removed some unused parameter warnings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8485 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-16 12:35:07 +00:00