Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,153 Commits 63 Branches 22 Tags 196 MiB
9fc94b87ae
Commit Graph

127 Commits

Author SHA1 Message Date
electron128
0aaf8d7f64 missing part of previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8077 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-26 07:20:28 +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
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
dab821cc1e disabled webui as a default setting 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-20 21:29:06 +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
csoler
d2c4c3bb09 added new flag to allow peers auto-download recommended files from trusted neighbor nodes, which give the possibility to push data to other nodes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-18 19:07:58 +00:00
csoler
6585cfca2c fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-13 19:34:38 +00:00
thunder2
7f58460e5f Added DEPENDPATH to pro files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 23:14:35 +00:00
defnax
a9b72e2c2c update rs icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-05 00:28:08 +00:00
thunder2
dd1f88a1bb Replaced external library libcrypt32-cygwin.a by libcrypt32.a from MinGW for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-08 16:44:25 +00:00
thunder2
d0238810b7 Common folders for libraries, includes and binaries of all external libraries for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-05 15:31:00 +00:00
csoler
62dc21d3b7 added missing -lpthread for some systems 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-09 17:05:20 +00:00
csoler
c7f551a0d1 added missing dependencies in INCLUDEPATH if sqlcipher is not installed in the system 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-06 16:48:39 +00:00
csoler
e7489ea2dc patch from serhaf to fix auto-detection of sqlcipher 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-09 18:11:10 +00:00
thunder2
eb22610145 Merged revision 7443 from branches v0.5.5 
Added patch from Henry:
- Added translation for password input
- Fixed utf8 issue in ProfileManager

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-07 19:37:04 +00:00
thunder2
4c6ab35867 Updated external library to openssl-1.0.1h 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-05 23:51:48 +00:00
csoler
2c0a22b68e fixed compilation of rs-nogui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-19 12:42:27 +00:00
thunder2
9ea4ab24e0 Updated external library to openssl-1.0.1g for Windows compile (merged from v0.5.5) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-10 23:15:24 +00:00
defnax
76ecaffccb updated the MinGW build bat files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-05 22:46:37 +00:00
thunder2
98e4271695 Fixed compile on Windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-04 21:59:55 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
drbob
7ca3ed78ae fixed up nogui for new rsaccounts stuff. 
added missing OSX make stuff.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 03:26:26 +00:00
drbob
6855a7ac98 Added OSX protobuf section. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 03:22:41 +00:00
csoler
1aa2e221d2 put compilation error in place and redirect users to branch 0.5.5. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-29 20:07:48 +00:00
csoler
f3af40337f fixed compilation of introserver.cc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 20:06:55 +00:00
csoler
630824aa1b Updated the notification system. Main changes are: 
- the notification system is now a service, p3Notify, that is a public RsNotify.
- RsNotify does nothing except providing a registration system for new notify clients.
- Clients should derive a notify client from the NotifyClient class and register it to rsNotify
- all registered clients get all notifications, so only derive the needed methods. This should allow 
  plugins to get notifications as well.
- updated the code to call RsServer::notify()->[notification method] from inside libretroshare
- pqiNotify has been removed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-07 22:51:22 +00:00
thunder2
13e7ac8b43 Fixed compile of the libraries with MinGW 4.8 on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 23:11:10 +00:00
csoler
fcb441cbd7 fixed utf8/wstring calls 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 18:49:02 +00:00
thunder2
bf9270dd54 Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions. 
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 16:23:02 +00:00
drbob
420fadb5c3 updated nogui for latest V0.6 changes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 13:16:51 +00:00
thunder2
959c9c2aca Fixed compile on Windows when using shadow build. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-01 13:50:34 +00:00
drbob
2bdc85705e bug fixes from electron. 
- fix for participating list. (list iteration was broken)
 - fix for search limit parameter. (make optional)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-27 01:59:49 +00:00
csoler
299678b9c8 patch from Stefan Sperling to allow openbsd compilation.Forgot these files last time 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 17:38:51 +00:00
drbob
ed8abf6411 Tweaks to nogui to remove rsiface references. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-21 21:51:36 +00:00
csoler
e74d91d7a5 fixed small bug introduced by command line params refactoring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-07 14:43:34 +00:00
csoler
aba5033604 - added argstream to handle commandline arguments 
- switched tests to use the common value of argstream in libretroshare, rather than the one in tests/common
- reworked command line arguments in rsinit and retroshare-nogui.
- improved passwd hash explanations
- improved command-line help.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-06 17:01:38 +00:00
csoler
f27b2368ab patch from henry to improve commandline info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6550 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-02 18:27:50 +00:00
thunder2
4ce08bee38 Renamed the lib of sqlcipher to libsqlcipher.a for Windows too. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 00:58:17 +00:00
csoler
fa3cc82790 latest version of sqlcipher has changed the lib name to libsqlcipher.a 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-05 18:57:56 +00:00
csoler
8d7bbb25f8 fixed slite lib linkage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-25 19:48:51 +00:00
thunder2
05f8b15cfe Added missing file "stream.proto" to the automatic generation in retroshare-nogui.pro. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:43:24 +00:00
drbob
f02383f5d6 from retroshare/code/branches/v0.5-rpc-b1 
--- Merging r6107 through r6332 into the rest of retroshare.

Updated version of RPC protocol with fancy new features like:
 - streaming.
 - add / remove friends.
 - file listings.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:10:34 +00:00
drbob
1f01eda2e2 Added missing rpcprotoutils file. 
Updated files RPC with TransferState



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 22:43:02 +00:00
drbob
bef0b26744 Improvements to SSH RPC interface. 
- Added Directory Listings.
 - Added File Streaming Node->Client
 - Updated generated protobuf files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6282 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-25 19:05:31 +00:00
csoler
a05f04900c removed temporary files from svn, as svn up cannot overwrite existing files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6211 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-11 20:52:56 +00:00
csoler
8cc98aeabc added missing pthread lib for ubuntu raring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6196 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-08 12:57:27 +00:00
csoler
579b04db05 switched libssh to 0.5.4 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-04 22:09:10 +00:00
thunder2
d1b488002e - Fixed generating of protobuf files in retroshare-nogui.pro for shadow build and Windows compile. 
- Added dummy files for generated protobuf files. Without these files qmake doesn't add it to the makefile.
- Added svnignore:* to gencc directory.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-02 13:50:07 +00:00
csoler
2752a6975d patch from Henry Morgan to auto-detect system-wide libssh and use it to compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-28 22:48:28 +00:00