Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-13 01:44:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,338 Commits 63 Branches 22 Tags 195 MiB
cc51298de6
Commit Graph

356 Commits

Author SHA1 Message Date
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
thunder2
d17a7faf93 Added missing fclose to ApiServerMHD::accessHandlerCallback. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-14 21:34:41 +00:00
csoler
978239f32f forgot this from previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-11 20:42:01 +00:00
electron128
a28543708d webui: added transfer rate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8398 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 09:25:11 +00:00
electron128
3dc0da6e2c attempt to fix the webui not loading problem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8371 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 17:42:06 +00:00
electron128
aea5a77aeb webui: allow to set peer flags when adding friends (whitelist flag is set to false) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8364 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 12:57:09 +00:00
csoler
e9b9dce9f5 created 2 subclasses of RsThread, one for ticking services, and one for single shot jobs. Now all threads use the same base code. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-22 20:54:38 +00:00
electron128
989ca378d7 webui: show a warning if JavaScript is disabled, show a warning when not connected to the server 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-16 12:22:06 +00:00
electron128
cfaa8d4559 fixed path in webui readme 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8229 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-11 18:24:13 +00:00
electron128
8e65054181 added hint to check if port is already in use if webinterface failed to start 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8228 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-11 18:23:16 +00:00
electron128
ef0bc745ce fixed wrong path in libresapi readme 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-06 18:50:20 +00:00
electron128
96d45e7237 fixed crash in rs-gui when stopping webui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-06 18:17:02 +00:00
electron128
df253e65c6 webui: added display of own cert 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8219 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-04 18:10:15 +00:00
electron128
744f340746 added string escape in SuperEasyJSON serialization 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-04 18:08:26 +00:00
electron128
7c1cab07e8 webui: 
- redesigned friends list
- added friendly units on downloads page
- added progress bar on downloads page
- fixed makefile directories and updated readme

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-01 15:24:05 +00:00
csoler
10f5a806e3 commited webfiles. The Makefile in webui should probabl ydirectly store the generated files in this directory 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-30 18:32:08 +00:00
electron128
fd5c53fad7 fixed webui makefile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-29 17:18:14 +00:00
electron128
8a4140d904 webui: hide login/shutdown when running in retroshare-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-29 12:20:52 +00:00
electron128
b05ee805e4 webui: 
- added better live reload. It uses the Retroshare built in server. Grunt is not required anymore.
- removed unused buttons
- started ChatHandler

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-29 11:57:56 +00:00
electron128
c908c81481 enabled webui to show own locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-28 14:56:38 +00:00
electron128
3d3ffea102 webui: fixed bug with peers without locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-25 09:08:54 +00:00
electron128
127c104e5e added web interface to retroshare-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-24 14:31:13 +00:00
electron128
c5c524862c webui: 
- added missing fclose
- fixed makefile
- added support for urls and forward/backward browsing
- started optimization for touch screens


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-06 09:44:10 +00:00
electron128
73a6ca8af6 - added support for multiple client threads to ApiServer 
- added api client which reads the password from stdin. This allows to login from the webinterface and from the terminal at the same time.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-31 18:00:40 +00:00
electron128
8fb6670857 added html/css/js files for the webinterface 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-30 14:40:20 +00:00
electron128
8a15755ac0 added Content-Type headers, added redirect to index.html 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-28 13:46:39 +00:00
electron128
336001abd9 updated SuperEasyJSON 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-27 18:43:07 +00:00
electron128
c252195d8d fixed compile on windows (reverts commit 8080) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-27 12:45:27 +00:00
csoler
24c421c0b7 fixed compilation on ubuntu 12.04 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-26 20:55:59 +00:00
electron128
f498a8880a fixed compile on ubuntu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-26 09:46:25 +00:00
electron128
45ac4cca06 limited webinterface to localhost by default, added command line option to listen on all interfaces 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8076 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-26 07:17:39 +00:00
electron128
cb6860a08d allow RsControlModule to work without control over RsInit (e.g. with rs-gui) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-25 08:31:19 +00:00
electron128
4fa3d00f26 disabled file streaming for libmicrohttpd < 0.9.31-1 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-23 16:34:20 +00:00
electron128
0cd3f3868e added command line parameters for webui port and base directory. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8069 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-22 12:29:30 +00:00
csoler
562eeaaae8 fixed compilation problem in ApiServer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-21 08:02:49 +00:00
electron128
b912ac656c fixed compile with libmicrohttpd >= 0.9.20 (old version numbers are in hex) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-20 07:18:37 +00:00
thunder2
f82f86387b Added missing includes for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-19 10:09:35 +00:00
electron128
594590f635 fixed compile with libmicrohttpd >= 0.9.20 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-19 08:20:46 +00:00
csoler
ef5d591098 fixed compilation on ubuntu using microhttpd 0.4.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8048 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-18 20:20:40 +00:00
electron128
ad1bc7f3b8 added resource_api and rs-nogui-webui (requires libmicrohttpd, Html files are not included) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-18 18:48:43 +00:00