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,834 Commits 63 Branches 22 Tags 194 MiB
9871b37ef2
Commit Graph

179 Commits

Author SHA1 Message Date
csoler
5bbaa1e8e5 added people settings page, removed debug output 2016-04-02 16:14:18 -04:00
Phenom
76fddb29af Fix delete in PictureFlow 2016-03-16 19:05:39 +01:00
csoler
3db3ccf636 merged with upstream 2016-02-10 00:00:21 -05:00
thunder2
8dde723e90 Added security hardening flags for ASLR and DEP protection for Windows compile. 2016-01-28 19:02:42 +01:00
csoler
94b586846e moved SearchDialog into FileTransfer/ 2016-01-21 21:49:52 -05:00
Cyril Soler
9999742ec7 reverted commit for phonon since phonon is deprecated. Will be replaced by qtmultimedia in the next commit 2016-01-21 11:32:17 -05:00
csoler
e25787bcd5 fixed sound on linux using phonon. This should be extensible to all unix systems 2016-01-20 23:25:08 -05:00
csoler
6ecd2991e7 merged with latest trunk 2016-01-01 15:15:19 -05: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
defnax
8e9fe6d800 Merge pull request #189 from hunbernd/feature/chat-enhancements 
Chat enhancements
 2015-12-22 01:07:02 +01:00
defnax
4ccab411c0 Added new Emojione Emoticons 2015-12-21 22:27:10 +01:00
hunbernd
ff44965e2c Added save image function into chat 2015-12-06 23:00:29 +01:00
hunbernd
1dd0a2acd1 >greentext 2015-12-06 21:11:47 +01:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08: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
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
Phenom
625461bf69 Fix Windows 7 32b Compilation from scratch. 
Add scripts to build Libs on branch.
 2015-10-17 12:15:35 +02:00
sirjenster
68fd1b206e First Mac/OSX compile fixes 2015-09-22 18:33:16 -07:00
csoler
a1ce7f2d6f updated branch to upstream/master 2015-09-06 17:37:13 -04:00
csoler
697b7be5d1 fixed compilation of circles 2015-09-06 17:34:43 -04: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
ae43058520 Make wikis compile 
- rsWiki->updated() doesn't exist anymore, so I ported WikiDialog to
  inherit from RsGxsUpdateBroadcastPage
- add -lglib-2.0 to pegmarkdown.pro
 2015-09-05 09:25:08 +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
AsamK
4e917ea26c Disable compiling of pegmarkdown by default, only used for wiki 
- Move unfinished CONFIGs to common retroshare.pri file
- Compile and link pegmarkdown only if CONFIG+=wikipoos is set
 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
30d7aa3be3 Remove dependency on qt script, it's unused 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
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
AsamK
66ba687acd Install qss and chat styles 2015-08-27 22:35:28 +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
thunder2
48c3eedcf5 Removed "CONFIG += console" for Windows release build. 2015-08-19 13:22:31 +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
2a47095599 removed unused method for OutQueue statistics; improved BW curve display; fixed a few display bugs 2015-07-31 17:24:19 +02:00
csoler
975b2d8783 moved all bw graph files in statistics. Removed outqueue info widget. Created new cpp files to host the bw graph code. Started minimal UI to display bw information. The goal is to create a widget for displaying selective bw info [work in progress] 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-10 03:24:39 +00:00
csoler
ebc8bb072c fixed a few icons and sizeHint functions. Removed unused SFListDelegate files from compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-29 16:08:17 +00:00
csoler
b8434a649e added a few 128px icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 11:47:37 +00:00
thunder2
9bef4502b1 Added feed item to notify a blacklisted ip address. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8346 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 21:36:26 +00:00
electron128
cee1819b7d added toasters for incoming audio/video call to voip plugin (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8295 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-26 15:19:57 +00:00
csoler
e449e709b5 attempt to improve/clarify relationship between nodes and PGP keys. Removed duplicate options and splitted ConfCerDialog into a dialog to show nodes certificates and PGP key information 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-12 20:30:44 +00:00