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
7,847 Commits 63 Branches 22 Tags 194 MiB
829c2f396e
Commit Graph

144 Commits

Author SHA1 Message Date
AsamK
829c2f396e Move LIBS from gui/nogui linux section to libretroshare 
remove -lglib-2.0 it's not needed:
was added in d8e327afcc to compile for arch,
but it compiles on arch now also without this
 2015-09-01 14:53:17 +02:00
AsamK
846f7d0204 Make usage of sqlcipher explicit at compile time 
Either the build fails if it is not available, or the user specifies
CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.
 2015-09-01 14:53:09 +02:00
AsamK
dca295143a Use CONFIG+=create_prl for libretroshare 
Allows to specify all LIBS in libretroshare.pro so they don't also have
to be specified in gui/nogui.pro
 2015-08-31 22:50:47 +02:00
AsamK
b9c174ba8f Add BIN_DIR variable to allow packagers to override it 2015-08-31 22:50: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
AsamK
f002310cf2 Remove libpegmarkdown from win32 retroshare-nogui build 
It is only needed for gui
 2015-08-29 13:12:57 +02:00
AsamK
5ae5d76ffc Make file names consistent with packaging 
Rename executables:
RetroShare -> RetroShare06
retroshare-nogui -> RetroShare06-nogui

Add 06 suffix to icons and desktop file

Update README, debian rules and windows installer file
 2015-08-24 00:03:57 +02:00
AsamK
6b7a6e2313 Make RS installable with "make install" 2015-08-24 00:03:57 +02:00
electron128
13355a7efe changed Radix64::decode to return result as std::vector 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-18 13:45:08 +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
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
csoler
74c01423f0 improved login system: do not re-ask for passphrase when user clicks cancel. Removed warning stating that maybe passphrase is wrong 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-11 20:31:52 +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
7b5bfc99d3 added terminal restore to rs-nogui on linux. Enabled compile of webui in rs-nogui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-03 14:46:10 +00:00
electron128
4c5d8c2ede use same docroot in retroshare-nogui as in retroshare-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8188 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-29 17:45:33 +00:00
electron128
8a0d4caaa7 fixed wrong account numbering in retroshare-nogui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-28 12:08:43 +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
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