Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,396 Commits 63 Branches 22 Tags
Commit Graph

455 Commits

Author SHA1 Message Date
mr-alice
76831348e6 added update of last modif LS, and rsitems to update directories between friends 2016-08-22 07:49:45 +02:00
mr-alice
edc602f68f added infrastructure for synchronisation of file lists 2016-08-20 16:23:11 +02:00
MrAlice
82c18bbb86 added load/save for file hash cache 2016-08-09 15:07:02 +02:00
mr-alice
3e20b9ddf7 added p3FileLists service 2016-07-20 15:28:55 -04:00
sehraf
4d2d825d5b add new option to qmake to enable dht stunner 
removed dht stunner code when option is not set
 2016-06-21 13:55:23 +02:00
mr-alice
8e2ff56f9a merged to upstream/master 2016-06-18 16:59:01 -04:00
sehraf
6e38554bcd rename define UBUNTU to HAS_GNOME_KEYRING 
The name UBUNTU is misleading since it is only used to select the keyring backend (which is gnome keyring on linux).
This also allows to support other keyrings on linux in the future (e.g. KDEs keyring)
 2016-06-02 14:57:46 +02:00
Julian Ospald
ed867c52bd
Don't hardcode g++ in the toolchain settings 
Although it's already quite ugly that we overwrite QMAKE_CC like this,
hardcoding 'g++' can break the build where prefixed versions of
the toolchain are expected and where QMAKE_CXX is already properly
defined. So we just use QMAKE_CXX variable here.

This fixes build failures on some distributions, e.g.
https://galileo.mailstation.de/jenkins/job/lipidity/36/console
 2016-05-27 18:07:28 +02:00
mr-alice
89af650f74 basic bits of new file list sharing system 2016-04-14 18:25:12 -04:00
csoler
d13526facd added a new method rs_malloc that checks its arguments and prints a stacktrace on error/weird call. Changed the code everywhere to use this instead of malloc. Removed some mallocs and replaced with RsTemporaryMemory 2016-01-12 21:10:11 -05:00
Gio
ed7f958f95 Add stacktrave.h, sanitize p3LinkMgrIMPL::retryConnectTCP avoid to look for port on null sockaddr_storage 2015-12-31 15:42:22 +01: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
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
csoler
cb8b814543 added gxs tunnel service, based on distant chat code. Does not compile yet 2015-11-17 18:11:00 -05:00
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
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
7e708ff4aa Fix MiniUPnP IGD with newers versions. 
Only for windows, as other use UPnPBase.
 2015-10-17 12:15:36 +02:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
317e7ea5ab added some backend for reputation system 2015-10-04 23:14:49 -04:00
sirjenster
68fd1b206e First Mac/OSX compile fixes 2015-09-22 18:33:16 -07:00
AsamK
c80ad59fb2 Add workaround for broken sqlcipher packages 2015-09-22 16:36:02 +02:00
AsamK
0793a6a52d Use PLUGIN_DIR to define plugin directory only once 2015-09-06 22:27:22 +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
2bf81be6a7 Disable compiling of wikis in libretroshare 
It is disabled in the gui anyway
 2015-09-05 09:25:08 +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 d8e327afcc8677579568ad03e4ce040019c5750d 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
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
91e19fc61e Disable installing of headers and libretroshare.a 
The list of interface header files is outdated and probably of no use
to anyone.
 2015-08-24 00:03:57 +02:00
AsamK
d4a36ed38b Make data and plugin directory configurable at compile time 
e.g.:
$ qmake PREFIX=/usr/local
$ qmake LIB_DIR=/usr/lib64

A full recompile is necessary when changing the PREFIX!
 2015-08-24 00:03:57 +02:00
AsamK
6b7a6e2313 Make RS installable with "make install" 2015-08-24 00:03:57 +02:00
thunder2
2a6b623300 Added extended debug outputs of times in RsDataService. 2015-08-11 23:19:37 +02:00
thunder2
789df68582 - Added update of version information for Windows build 
- Added template file version.html.in
- Removed RS_BUILD_NUMBER from Windows executable FileVersion
 2015-08-04 15:15:49 +02:00
csoler
2b8eafa1db removed default debug flag in .pro files. Fixed up version.h in packaging script. 2015-08-02 18:35:27 +02:00
electron128
edf6b3e495 removed pqisecurity dummy functions. It is a packet filter which was never implemented. It's job is now done by service permissions. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-17 08:49:43 +00:00
thunder2
0ca37f6756 Added version information of the libraries to HelpDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-14 17:45:26 +00:00
csoler
047977b645 Started implementation of ban list. For now, just gathers the list of banned IPs from 
the DHT and is not used to reject IPs yet (the DHT list is, even if DHT is desactivated).
Next steps: GUI with switch controls, exchange of IP ban lists between friends, handling IP ranges.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-26 21:17:09 +00:00
csoler
a9ba944e27 improvements to global router: longer half-life for routing events, re-sending of un-delivered items, removed unused constants, added missing file to .pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8148 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-20 21:24:22 +00:00
csoler
a15b69f5e9 fix for linux compilation case where sqlcipher is present in a subdirectory of trunk (Patch from Heini) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-04 19:24:14 +00:00
electron128
81bbb9933d added missing part of 8114 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-04 10:21:05 +00:00
csoler
e58c9de067 fixed a few missing deletes when handling errors in grouter. Experimenting a new scope guard to hold temporary memory. (Patch from GuessWho, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-28 17:23:52 +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