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
12,904 Commits 63 Branches 22 Tags 194 MiB
b74520cb30
Commit Graph

239 Commits

Author SHA1 Message Date
thunder2
ea6431e276 Fixed Windows shadow build with Qt 5.6 or higher 2016-09-05 16:24:49 +02:00
thunder2
f3b8843384 Fixed QMAKE_PRE_LINK for Windows compile without MSYS2 2016-08-12 10:03:47 +02:00
Gio
fe7de83529 WebUI is now optional but enabled by default at compile time 2016-07-28 14:08:49 +02:00
csoler
c555300c37 fixed merging with upstream 2016-07-12 22:45:23 -04:00
csoler
d089e2ef1a added a GroupChooser class to choose groups of friend nodes 2016-07-09 18:06:59 -04:00
csoler
2dfe116a31 added compilation flag for profiling in GUI 2016-06-30 14:22:06 -04:00
Phenom
631a29c701 Add Build Status in ReadMe.md file. 
And add AppVeyor File.
 2016-06-15 20:53:56 +02:00
Phenom
d649659172 Add SIGFPE debug DEFINES. 
To allow debug SIGFPE easily.
Only need to uncomment DEFINES *= SIGFPE_DEBUG line in retroshare-
gui.pro.
 2016-06-11 14:38:31 +02: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
Phenom
10bb542e83 Allow only one instance for useLocalServer option activated. If exists, 
pass to it arguments.

For now, only allow to pass RsCollection file and retroshare://
protocol.
 2016-04-06 22:04:53 +02:00
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
thunder2
ff6f14b7de Fixed Windows compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8175 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-27 09:26:43 +00:00
electron128
127c104e5e added web interface to retroshare-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-24 14:31:13 +00:00
electron128
a37ab6f644 fixed compile on Linux with Qt5 (patch from sehraf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-04 10:12:05 +00:00
drbob
926dd3c8e4 Updated GUI to use new Message / Mail interface. 
Configuration is in MessageInterface.h for the moment



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-22 04:52:53 +00:00
csoler
ed014b0d34 added notification for VOIP calls (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-21 21:25:17 +00:00
thunder2
cdf9a5b4d4 Optimized search of feed items in RSFeedWidget by using a map instead of QTreeWidgetItemIterator. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-12 13:59:56 +00:00
thunder2
41750b0d27 Removed not used base class GxsIdTreeWidget. 
Used QPixmap instead of QIcon to draw the gxs image in GxsIdTreeWidgetItem.
Fixed use of transparent background in GxsIdDetails::GenerateCombinedPixmap (formerly GxsIdDetails::GenerateCombinedIcon).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-22 11:52:33 +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
defnax
96bf79daae Added Avatar Dialog at the moment for own peerid, soon for gxs avatars change. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 19:17:35 +00:00
csoler
b2c2b7fc85 implemented dedicated widget for service permission matrix. Permissions are not saved yet, and we also need a default switch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 14:38:19 +00:00
defnax
4a4ea80110 Added Person details dialog, for popup mode view. 
changed from setEnabled to setVisible, to not show up the disabled actions for Own Ids. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-24 19:27:19 +00:00
thunder2
94ec83fcdb Removed version files from retroshare-gui. 
Moved header file with version information to retroshare/rsversion.h.
Added version information to Windows executable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-14 23:26:51 +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
thunder2
6c3a6f161f Added a new base class RSTextEdit with placeholder for Qt < 5.2 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-25 02:39:40 +00:00
thunder2
78c71ab011 Added new class StyledElidedLabel and used it for nick name and channel label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-14 17:05:43 +00:00
thunder2
212e5c28f2 Added user notify for chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-12 23:50:35 +00:00
thunder2
90c3c24412 Moved font size definitions from ui files to default qss. 
Added new base class StyledLabel to emulate the missing font-size by factor in qss.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 22:09:44 +00:00
thunder2
3ef04a61c9 Added feed item for Posted group and message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-21 00:50:18 +00:00
thunder2
d70bb01b2e Added feed item for forum group and forum message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-19 12:40:42 +00:00
thunder2
97968170d1 - Added new base class for group feeds - GxsGroupFeedItem 
- Added feed item for channel group
- Added test of feed items for channels and forums
- Reworked existing feed items

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-18 00:49:21 +00:00
csoler
a3736a02d2 added systray menu in status bar. Helps people without a systray (Patch form Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-02 20:29:06 +00:00
csoler
ea5b923428 added very basic display of outqueue statistics in BwCtrlWindow. Removed unnecessary list::size() calls in pqistreamer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-31 21:24:42 +00:00
csoler
1f1c51b7d3 Used RSGraphWidget for bandwidth window too; Cleaned up remaining unused graph classes; Added a few missing params to RSGraphWidget; End of graph work. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-17 19:47:05 +00:00
csoler
8c1bf3cf8d improved RSGraph class. Used it for Turtle statistics and bandwidth statistics as well 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-15 22:00:49 +00:00
csoler
6e2df7e0de extended group share keys to Posted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-13 18:31:47 +00:00
csoler
edd7bf7c31 created a generic class for graphs, and used it for DHT. The plan is to use the same class to draw all graphs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-12 19:04:43 +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
csoler
d0469ccfc3 implemented publish key sharing between peers for channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-05 19:14:05 +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
9efc43f41c Big progress for People dialog. Phenom work. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 20:46:56 +00:00
thunder2
e07dac9ca7 Show channel logo in group tree 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-11 22:07:06 +00:00
defnax
1d668b377a forget to commit this 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7523 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-10 14:08:37 +00:00
defnax
1fdd6d6447 Renamed some defines 
Added background color for RTT stats graph
Moved statistics pages to statistics folder

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-10 13:53:48 +00:00
csoler
ff990b96b3 moved wiki, People, Circles to unifinished config target, so that only the finished parts of the code can be exposed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7516 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-09 18:46:09 +00:00
defnax
1b28e40346 Added "DHT graph" for display the RS DHT users in a graph 
Enabled Antialiasing for RTT Statistics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-08 14:45:31 +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
defnax
05be764186 Added a new Statistics Window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-04 17:01:28 +00:00
defnax
29a11b021e Added a graphframe to Bandwidth Control Window and Turtle Router Statistics Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-29 14:18:50 +00:00
csoler
f6db432c74 Merge of branch v0.6-rssocialnet 7419 to 7488. Changes from electron and myself: 
- added possibility to modify groups (e.g. edit circles)
- fixed mismatched free/delete in fimonitor.cc, authssl.cc, pqibin.cc (saving encrypted hash cache file)
- improved plugin interface class to allow plugins to access GXS objects.
- added method to un-register notify clients from RsNotify
- fixed pqisslproxy for windows, due to win not properly supporting sockets in non blocking mode.
- removed static members form RsInitConfig and made RsAccounts object a pointer. This prevents plugin initialisation problems at symbol resolving time.
- removed bool return from p3IdService::getOwnIds()



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-25 21:07:07 +00:00
thunder2
899aa36fb8 Added new files view to channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-05 20:50:55 +00:00