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,149 Commits 63 Branches 22 Tags 194 MiB
c41f98cb4c
Commit Graph

155 Commits

Author SHA1 Message Date
defnax
c41f98cb4c Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch 
Fix Windows 7 32b Compilation from scratch.
 2015-11-06 01:58:30 +01:00
csoler
261c7faa61 added missing fclose (issue #134) 2015-10-20 18:24:49 -04:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
AsamK
fe1ec9d510 Fixed mac compile. Moved sqlcipher.a to libretroshare.pro 2015-09-06 22:27:22 +02:00
AsamK
571336e1f4 Move duplicate common stuff out of platform parts 2015-09-06 22:27:22 +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
thunder2
d4226b6815 Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro 2015-09-05 21:31:38 +02:00
AsamK
1f134d3431 Remove gxs CONFIG, it's always enabled now anyways 2015-09-05 09:25:08 +02:00
thunder2
b1b2de617a Fixed Windows compile. 
- Set name for prl file in libretroshare.pro
- Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue
 2015-09-03 13:14:39 +02:00
AsamK
d116f40d6e Move openpgpsdk to common section of libretroshare.pro 
It is the same for all platforms
 2015-09-01 14:53:17 +02:00
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