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,274 Commits 63 Branches 22 Tags 194 MiB
4ccab411c0
Commit Graph

326 Commits

Author SHA1 Message Date
csoler
79aac23b6c fixed video codec! 2015-08-23 22:58:36 -04:00
csoler
f55c115bdb fixed a few bugs. Still not working 2015-08-23 22:39:16 -04:00
csoler
024999ed67 fixed bug in creating input image when encoding video 2015-08-23 21:08:27 -04:00
AsamK
6b7a6e2313 Make RS installable with "make install" 2015-08-24 00:03:57 +02:00
csoler
0bb5a74099 fixed some bugs. Still crashing in the decoding phase. Don_t know why. 2015-08-23 10:27:50 -04:00
csoler
4522fe85cc fixed encoding 2015-08-20 22:59:51 -04:00
csoler
1249423eff worked out some bugs. Still not working 2015-08-20 21:46:28 -04:00
csoler
9798c78e20 added decoding of avcodec 2015-08-19 22:17:50 -04:00
csoler
043fe53789 added avcodec encoding 2015-08-19 21:50:51 -04:00
cave beat
1d9e3988a3 removed LinksCloud 
LinksCloud has been replaced by Posted
and is hosted for archiving reasons in https://github.com/RetroShare/LinksCloud
 2015-08-19 20:26:23 +02:00
csoler
d28c1898fd first workign implementation of wavelet-based codec 2015-08-16 22:59:49 -04:00
csoler
49c6c8a1fa restored original params for JPEG codec 2015-08-14 22:44:39 -04:00
csoler
5aac92fc97 fixed bug in differential frame encoding 2015-08-14 20:15:44 -04:00
csoler
cd97fd9682 refactored video processing classes, to allow multiple codecs. Not working yet. 2015-08-14 16:44:20 -04:00
csoler
3bda2c2660 added differential frames encoding/decoding, and bandwidth items 2015-08-12 17:17:56 -04:00
csoler
c0614e70ac added preview option to show decoded stream in Audio config 2015-08-12 17:17:28 -04:00
csoler
2107a1c858 fixed up image display layout in VOIP config tab 2015-08-12 17:17:13 -04:00
csoler
94317d1a39 added graph display of instantly required bandwidth for VOIP, in preparation to chosing new video codec. GUI layout needs to be sorted. 2015-08-12 17:16:24 -04:00
thunder2
9265145ca7 Updated english translation 2015-08-08 21:14:02 +02:00
csoler
ec67ee0e00 added graph display of instantly required bandwidth for VOIP, in preparation to chosing new video codec. GUI layout needs to be sorted. 2015-08-07 21:40:48 -04:00
thunder2
c76141ed65 Added missing initialization in 
- pqissl
- pqissludp
- PeerConnectStateBox
- RsTlvBanListEntry
- RsServer
- TcpStream
- PGPCertificateInfo
- peerConnectAddress
- AudioInputConfig
- SpeexInputProcessor
- xProgressBar
- TBoard

Removed unused member:
- xProgressBar


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 11:03:18 +00:00
thunder2
20403a33a0 Added initialize of RsVOIPPingItem members 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8567 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-28 12:50:26 +00:00
thunder2
2494f02bbb Removed fix font size from plugins (Patch from Henry). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-28 10:26:48 +00:00
thunder2
3a71b8b662 Added stylesheet to plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-28 10:11:47 +00:00
thunder2
c3b794afb2 Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 08:14:09 +00:00
thunder2
5a53927b44 Feedreader: 
- Removed fix font size from ui.
- Added elided label for message title.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-23 14:23:17 +00:00
thunder2
0626255bbb Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8536 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-21 10:11:45 +00:00
thunder2
846d5f4f50 Optimized fill of feed items by moving the fill of the hidden area to the first expand of the frame. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-17 18:59:12 +00:00
thunder2
5f4e465a09 Added proper shutdown of the plugins with remove of the service and dlcose of the plugin handle. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-16 14:20:59 +00:00
electron128
3ed1be74a6 updated english translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-16 11:57:35 +00:00
thunder2
504bbc00f1 Fixed memory leak in p3FeedReaderThread::processXPath. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-14 23:39:05 +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
thunder2
ceb2825f83 FeedReader: Added check for forum author. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8404 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-09 18:03:09 +00:00
thunder2
578e15ffa7 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 13:35:40 +00:00
electron128
a78e80b9f8 fixed another x64 serialisation bug in FeedReader (see rev8396)(thanks to Eugene Tooms) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 12:20:17 +00:00
electron128
e1fbd77d80 removed empty #ifdef Q_WS_WIN 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 08:50:09 +00:00
electron128
17a76071b6 attempt to fix FeedReader not saving config on Linux x64 (untested) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-08 07:56:21 +00:00
thunder2
feaffedbb6 Fixed and updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-31 11:19:20 +00:00
defnax
fc97cdcfa2 Beautify Answer Button for VOIP Toaster 
Display peername on voip notify text

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-28 13:59:20 +00:00
electron128
3db9655c56 fixed memory leak in voip plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8303 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-27 12:07:07 +00:00
thunder2
4b1055ce2d Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-27 09:45:02 +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
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
defnax
c0ecc0da7a Beautfy the stylesheet for the "Accept Call" Button, display notify text for voip calls too. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8286 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-22 16:02:16 +00:00
electron128
252424932c fixed voip video 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8274 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-19 17:53:11 +00:00
defnax
e7c96af8ab changed notify text for incoming video call on Chat Window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8272 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-18 16:57:56 +00:00
electron128
b5bf3ce130 Renaming all to VOIP in VOIP plugin (patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8231 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-11 19:40:07 +00:00
csoler
0d930751da fixed opencv dependencies for all systems using pkg-config 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8210 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-05-03 11:25:47 +00:00
csoler
9ad35ad03f add popup when get incoming VOIP call 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8183 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-28 16:54:38 +00:00
csoler
7c4947fbfb removed RTT statistics tab from VOIP plugin as it is already provided in Statistics 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-25 14:02:45 +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
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
a766850a22 Fixed Windows compile of VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 17:30:45 +00:00
csoler
e25c49cfe3 added missing lib on link line 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 15:57:19 +00:00
csoler
67bd9493e1 fix memory management issue in voip (patch from electron) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 15:42:15 +00:00
csoler
326d91d4c7 fixed VOIP compilation (patch from electron) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-30 14:26:04 +00:00
csoler
13d7866171 simplification of the chat interface to libretroshare using a single unified class for chat IDs. Used a common chat widget for all chats including broadcast. Opens the way to having plugins send/recv chat messages. Patch from Electron. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-29 21:41:05 +00:00
thunder2
f7a08a53a1 Updated languages de, es and ru from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-27 17:56:35 +00:00
csoler
993135c576 added missing dependencies to README file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-22 15:51:02 +00:00
thunder2
3f3c1983c8 Fixed some typos (patch from Henry) 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-22 15:44:47 +00:00
defnax
6b690560fc correcting icon size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-19 17:41:34 +00:00
defnax
f0d3d66e3f Moved the VoIP Buttons to the top right corner on the Chat Window. 
Moved Search Filter feature into a frame, to hide by default for a clean Chat Window, optional enable from the menu.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-19 12:17:58 +00:00
thunder2
a3b844da6b Fixed some typos (patch from Henry) 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-17 18:02:52 +00:00
thunder2
398f446300 Changed some more splitter behaviour when resizing the window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-13 23:32:23 +00:00
thunder2
f9846c02ab Removed unecessary space around the main pages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-11 00:13:40 +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
defnax
b11459329b * Moved to display own video at bottom and Friend at top. 
* Added to display system message text when call is stopped.
* Fixing spaces on chat window.
* Clean up chatwidget buttons, moved text color to the font menu button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 14:21:36 +00:00
defnax
7a06e2f449 Added a border radius to the Video Widget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-05 16:47:59 +00:00
defnax
1648842dd6 * Moved to Display the Video Widget on the right side 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-04 13:49:04 +00:00
thunder2
069e8e490a Enabled creating forum messages in FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-24 22:40:29 +00:00
defnax
c731525b23 update the windows build bat`s 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-22 13:32:26 +00:00
thunder2
aa080e02f0 Forgot to commit the changes in FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-16 01:42:57 +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
thunder2
cef70ef3df Fixed load/save config of FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7574 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-28 22:33:17 +00:00
defnax
4eed106579 fixed strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-26 11:02:51 +00:00
defnax
0697f29289 fixed naming 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-21 13:53:52 +00:00
defnax
8b1df1d555 changed video icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7550 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-21 12:31:16 +00:00
defnax
2350837bc6 Fixed to hide the Hangup Button by default, only when call is started show 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7547 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-20 16:44:26 +00:00
defnax
6f96443813 Hide Video Chat widget by default, only show when Video Chat is started. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7546 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-20 16:28:26 +00:00
thunder2
99b55fbe65 Changed plugins to the new interface 
rs_pqi_service -> p3_service

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-26 22:16:32 +00:00
defnax
906efa6f6c renaming tool tip 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-13 13:19:22 +00:00
thunder2
1485361a1e Fixed Windows compile of VOIP with Qt 5.3.1 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 11:38:34 +00:00
thunder2
6792348402 - Moved settings for user notify into the base class 
- Removed defines TRAYNOTIFY_...

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 20:01:12 +00:00
csoler
c6103b7535 added bandwidth measurement for video. Still needs codec to accound for it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-20 20:50:36 +00:00
csoler
ee0c48b912 fixed bug due to deleting video capture device 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-17 14:13:02 +00:00
thunder2
6dace62abe Fixed Windows compile of VOIP 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 21:12:10 +00:00
csoler
5df440b1bb bug fix in video sending 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7453 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 20:49:57 +00:00
csoler
01c467c4c0 added serialisation/transmission of video data 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 20:04:31 +00:00
csoler
b6089f3b91 Started implementation of Video Chat (not working yet!). 
- GUI part is done
- implemented a very basic JPEG codec
- added echo frame in configuration panel
- created a video capture object that uses OpenCV (should be cross systems)
Remains to do:
- serialise and send frames through p3VoRS
- use a serious codec (e.g. Theora+x264)
- add icons to reflect camera state (failure/working/sending/...)
- compilation on windows 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-13 13:57:25 +00:00
thunder2
d8ed978b28 Merged revision 7410 from v0.5.5 
Fixed Windows compile with MinGW 4.8.2

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-21 21:12:27 +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
thunder2
31962ea0c5 FeedReader plugin: 
- Added check of feed parent id in loadList
- Trimmed downloaded xml string to process xml strings with leading spaces

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7359 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-09 23:12:03 +00:00
csoler
71a02003be fixed compilation of FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-23 20:48:02 +00:00
csoler
33abca82e5 - removed LinksCloud from plugins (based on obsolete cache system) 
- removed copy constructor of RsGenericId from std::string as it allowed many inconsistencies and double transforms of IDs from/to strings


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 16:34:26 +00:00
csoler
160e04fe9a fixed VOIP plugin to work with v0.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 14:21:53 +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
thunder2
f818bb8e9a Fixed Windows compile with Qt 5 (Merged from branch v0.5.5) 
- Revert change of revision 7063 in openpgpsdk.pro for Windows compile
- Changed order of the libraries in FeedReader plugin

Fixed Windows compile with MinGW 4.8.0
- Added missing include

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-12 22:03:20 +00:00
thunder2
cedbd051ac Deactivated code for old forum handling in FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-04 22:06:33 +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