Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,234 Commits 63 Branches 22 Tags 196 MiB
f125539d79
Commit Graph

428 Commits

Author SHA1 Message Date
Gioacchino Mazzurco
92f90178c4
RS version is now parametrizable at compile time 
Avoid the need of dirty patching to set the version at build time
In case RS version is not passed as argument attempt to determine it
  using git describe, if unavailable use hardcoded default
 2018-09-12 10:49:36 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
csoler
0f758902cd
started cleaning the mess with rsAccounts: only exposed useful functionality of rsAccount beyond a static class and removed all references to rsAccounts in the code 2018-07-24 23:47:32 +02:00
Gioacchino Mazzurco
b4d2ce82c1
RsTokenService use enum for request status 2018-06-24 18:56:48 +02:00
thunder2
38ac234862 Fixed Windows compile with pre-compiled libraries 
Added new variable EXTERNAL_LIB_DIR to specify path of external libraries
 2018-05-07 09:42:36 +02:00
csoler
676c070152
extended the rapid_json trick to plugins 2018-05-03 15:55:21 +02:00
thunder2
c92b860174 Windows build environment: 
- Updated external libraries
- Added compile of plugins to build.bat
- Added copy of Qt style DLL to pack.bat and Windows Installer
- Removed "CONFIG=console" for release build
 2018-03-05 11:05:04 +01:00
csoler
e3d8d86044
updated translation files 2018-02-20 23:03:33 +01:00
csoler
d0039241d3 replaced usleep() by rstime::rs_usleep() which accepts times >= 1 sec. Should fix problems on windows 2018-01-27 20:22:31 +01:00
Phenom
a3acd585f4 Fix TravisCI on MacOS compilation. 2017-12-12 19:39:04 +01:00
Phenom
d234b8be5e Fix CppCheck in XPathWrapper.h 
/plugins/FeedReader/util/XPathWrapper.h:46: warning:
Cppcheck(noExplicitConstructor): Class 'XPathWrapper' has a constructor
with 1 argument that is not explicit.
 2017-11-07 22:11:29 +01:00
Phenom
5bf056c7a4 Rename retroshare06 to retroshare 2017-07-17 10:45:18 +02:00
Phenom
b12fd11496 Change RetroShare06 to lower case 
This is important to comply with linux standards.
 2017-07-17 10:45:17 +02:00
csoler
861dc165f7 switched VOIP to new serialization 2017-05-02 22:05:54 +02:00
csoler
cecd9a3368 merged upstream/master 2017-04-30 20:14:23 +02:00
Phenom
90cd6233d8 Fix CAS warnings: Potential leak of memory pointed to by 'toaster' 
Memory Error: Memory leak: Potential leak of memory pointed to by
'toaster'
 1: Memory is allocated in /home/phenom/GIT/RetroShare/trunk/plugins/
VOIP/gui/VOIPToasterNotify.cpp:182
 2017-04-25 09:49:40 +02:00
Phenom
b2b7d004cd Fix CSA warnings: Called C++ object pointer is null 
Logic error: Called C++ object pointer is null
 1: 'di' initialized here in /home/phenom/GIT/RetroShare/trunk/plugins/
VOIP/gui/VOIPGUIHandler.cpp:157
 2: Assuming 'di' is null in /home/phenom/GIT/RetroShare/trunk/plugins/
VOIP/gui/VOIPGUIHandler.cpp:158
 3: Called C++ object pointer is null in /home/phenom/GIT/RetroShare/
trunk/plugins/VOIP/gui/VOIPGUIHandler.cpp:161
 2017-04-25 09:48:48 +02:00
csoler
e2d9152b22 moved converted serialisation files into new directory rsitems/, leaving serialiser/ for the serialisation classes 2017-04-18 21:11:37 +02:00
Phenom
87dd614088 Fix Clang Warnings: private field 'encoding_debug_file' is not used 
warning: private field 'encoding_debug_file' is not used [-Wunused-
private-field]
    FILE *encoding_debug_file ;
 2017-04-17 22:01:48 +02:00
Phenom
76f7573659 Fix Clang warnings: comparison of array != a null pointer is always true 
warning: comparison of array 'known_zones[i].tzName' not equal to a null
pointer is always true [-Wtautological-pointer-compare]
                        for (int i=0; known_zones[i].tzName != 0; i++) {
 2017-04-17 21:58:19 +02:00
thunder2
733b1143ba Updated languages from Transifex 2017-03-10 15:57:40 +01:00
csoler
b3b2a4bf08 Merge pull request #726 from mestaritonttu/patch-8 
Added whitespace
 2017-03-07 21:54:10 +01:00
csoler
3d0c28ddb9 Merge pull request #724 from mestaritonttu/patch-6 
Fix typos
 2017-03-07 21:52:19 +01:00
csoler
5bad3269c4 Merge pull request #725 from mestaritonttu/patch-7 
Fix grammar
 2017-03-07 21:49:14 +01:00
mestaritonttu
400dde9ec3 Added whitespace 2017-03-07 13:09:04 +02:00
mestaritonttu
c9a4a5589b Fix grammar 2017-03-07 13:06:22 +02:00
mestaritonttu
86e7243064 Fix typos 2017-03-07 12:56:25 +02:00
mestaritonttu
d7dc9cc25a Whitespace inside <p> 2017-03-07 12:53:18 +02:00
thunder2
6a6bcf73dc Fixed Windows compile of VOIP 2017-03-06 21:46:42 +01:00
thunder2
1eb22f88a9 Updated Windows build to opencv-3.2.0 2017-03-02 07:55:18 +01:00
csoler
7bbb993769 disabled emoticons from messages and toasters, since they significantly slow down the whole software 2017-01-20 23:00:05 +01:00
Phenom
674b6de381 Fix Some gcc warnings 383 to 208 lines 
Left explicit #warning and deprecated.
Some lines are wrong indented and produce mal formed code.
 2016-11-30 22:01:01 +01:00
thunder2
ea6431e276 Fixed Windows shadow build with Qt 5.6 or higher 2016-09-05 16:24:49 +02:00
defnax
0c36a18aa9 update icon 2016-08-24 16:48:30 +02:00
defnax
4b11fb1729 update FeedReader icons 2016-08-16 22:26:48 +02:00
thunder2
3640e32974 Updated build of external libraries for Windows compile 2016-08-15 11:49:36 +02:00
thunder2
f1847a954f Changed check for MSYS2 environment for Windows compile 2016-08-15 09:57:23 +02:00
defnax
e2d29f6905 update icons 2016-08-04 19:46:20 +02:00
csoler
927f782bef pass over compiler warnings 2016-06-05 10:43:57 -04:00
sehraf
24b3da06ef add names to feedreader threads 2016-06-01 17:01:43 +02:00
thunder2
ccf96a35c3 Updated languages from Transifex 2016-02-05 20:04:46 +01:00
thunder2
ca8eee50d6 Updated english translation 2016-02-02 19:36:35 +01:00
thunder2
8dde723e90 Added security hardening flags for ASLR and DEP protection for Windows compile. 2016-01-28 19:02:42 +01:00
defnax
2b52456409 Added new iconset for Voip, by Beluga 2016-01-18 13:36:38 +01:00
thunder2
0ff634935b Fixed possibility of XXE injection in FeedReader plugin. 2016-01-15 21:41:24 +01:00
csoler
d55993d1e4 removed two instances of malloc(0) captured by new rs_malloc funtion 2016-01-12 21:43:04 -05: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
csoler
9c6e7dfc13 added checks after mallocs in several files 2016-01-11 23:49:00 -05:00
csoler
6e9d96efd8 fixed potential integer overflow / Out of bounds read in RsVOIPDataItem.cc 2016-01-11 20:26:19 -05:00
Phenom
c5e6f62382 Make Plugin working in Mac OSX. 2016-01-02 14:19:53 +01:00
csoler
8a41554754 fixed some leaking memory issues in loadList() methods, and also increased consistency by not returning non empty list with deleted items inside 2015-12-30 18:20:09 -05:00
Phenom
cb4579e8c7 Fix compilation for plugins but miss RetroShare-gui library linking. 
Get ld: symbol(s) not found for architecture ...
 2015-12-26 17:20:54 +01: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
defnax
2cc0f6dcd7 Added Decline Button to Voip Toaster 
Added new stylesheet from Beluga for the voip buttons
 2015-10-27 18:52:01 +01:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
f0cf561ad3 Remove Time between display frame in VOIP 
But let message to take care of CPU usage at this point...
 2015-10-17 12:15:36 +02:00
Phenom
340e78f064 Fix MSys 32b depends and Add a specific MSys2 Makefile to compile 
missing libs.
 2015-10-17 12:15:36 +02:00
Phenom
e47168baae Make VOIP running with newer FFmpeg version. 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
Phenom
d195b154bc Fix FeedReader compilation 
(Thanks to AsamK)
 2015-10-17 12:15:36 +02:00
Phenom
3172cd9ca4 Fix VOIP Compilation on Vivid 
as they use a different version of rational.h
 2015-10-13 19:17:25 +02:00
defnax
58bd186c23 Set a default stylesheet padding size for the Accept/Decline buttons 2015-10-13 00:38:46 +02:00
Phenom
7bc6fdfdee Fix the height of the ToolBar in VOIP FullScreen for Windows. 2015-10-12 23:17:00 +02:00
Phenom
3d32fab56f Reactivate SoundEvents in VOIP. 
Let some stuff for soundManager, like don't play mutli
times the same event in same moment.
For that I added lastTimePlayOccurs.
 2015-10-12 18:25:03 +02:00
Phenom
6a3f4ce87c Update Toaster when ringing. 2015-10-11 10:31:06 +02:00
Phenom
3deee001d4 Hang Up when close chat window. 2015-10-10 18:47:07 +02:00
Phenom
1989f366a7 Add Accept, Ring and HangUp event for Video and Audio. 
Now you don't send data before friend accept.
 2015-10-10 15:26:04 +02:00
defnax
95bdd7f0a7 Fixed ChatWidget Margin's 
Set Alignment for frame off's Video icon
 2015-10-07 01:35:31 +02:00
defnax
993ca63106 Fixed icons display 2015-10-06 19:58:42 +02:00
defnax
3f116e2b22 display voip icons in a bigger size 2015-10-06 18:54:43 +02:00
Cyril Soler
fedb8f7152 Merge pull request #129 from PhenomRetroShare/FixVOIP_AllowVOIPToSaveSetting 
Allow VOIP to save its settings.
 2015-10-06 09:47:54 -04:00
Phenom
05d95d3ffd Use QFontMetricsF to define Icon size. 2015-10-05 21:04:26 +02:00
Phenom
2b1d39cea1 Add HideChat Button. 
Change layout of video when text is hidden.
Add toolbar in fullscreen.
 2015-10-05 21:04:26 +02:00
Phenom
5d8972e82d Add real FullScreen Mode 2015-10-05 21:04:26 +02:00
Phenom
8a7e359557 Add a button on VOIP to hide text when video is on. 2015-10-05 21:04:26 +02:00
Phenom
3c8f232915 Allow VOIP to save its settings. 2015-10-05 19:15:53 +02:00
csoler
b5bfddd1bc commit from PR#86 for VOIP, modified so as to restore real-time preview and video display 2015-10-03 22:08:24 -04:00
Cyril Soler
da417eede9 Merge pull request #96 from AsamK/qmake_3 
Qmake: Use PKGCONFIG and reduce duplicate code in .pro files
 2015-09-07 20:38:47 -04:00
Cyril Soler
63e38af19c Merge pull request #94 from AsamK/correct_libav_version 
Fix libav version check
 2015-09-07 20:36:03 -04:00
AsamK
0793a6a52d Use PLUGIN_DIR to define plugin directory only once 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
csoler
8bb76c95ac fixed VOIP compilation on ubuntu 14.04 2015-09-05 16:21:49 -04:00
AsamK
d6f50c71f2 Fix libav version check 
- Off-by-one error in the #ifs
- Libav actually contains the old constants and functions as well,
  marked as deprecated. Just the CodecID enum was removed completely.
 2015-09-05 15:52:03 +02:00
AsamK
f2994b7558 Old libav versions used constant without AV_ prefix 
From Jenster
 2015-09-04 23:59:13 +02:00
AsamK
efc057e128 Fix build with libavcodec < 55 2015-09-04 23:42:26 +02:00
AsamK
976f53bba2 Remove -lavformat from VOIP, it's unused 2015-09-04 17:32:50 +02:00
AsamK
484edc3445 Fix build for openSUSE 
Use qmake built-in pkgconfig functionality
 2015-09-04 17:30:12 +02:00
AsamK
22816f0b9e Remove unnecessary includes from VideoProcessor 
libavutil/channel_layout.h isn't available on debian 7 wheezy
 2015-09-04 17:30:12 +02:00
Phenom
0a843989e4 Fix VOIP compilation with recent libavutil-dev package. 
/usr/include/libavutil/common.h error 'UINT64C' was not declared in this
scope.
 2015-09-04 16:10:41 +02:00
thunder2
661453653c Added register of codecs to VOIP. 2015-09-04 14:20:36 +02:00
thunder2
738dadadc9 Fixed Windows compile of VOIP. 2015-09-03 16:33:50 +02:00
thunder2
9bbdefa48a Added "QMAKE_LFLAGS += -Wl,--start-group" to pluigns for Windows compile. 2015-09-03 16:24:57 +02:00
csoler
5dfdffb763 merged Pull Request #81, providing avcodec video encoding/decoding 2015-09-02 22:39:39 -04:00
csoler
77c0d562fb fixed deleting/stopping video devices 2015-09-02 22:14:04 -04:00
csoler
c5cd701d4c removed experimental wavelet codec 2015-08-31 22:44:34 -04:00
csoler
3d9e3e8b7c attempt to setup variable bitrate. Improved codec params 2015-08-31 22:41:38 -04: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
csoler
68918bf9c1 added variable bitrate and attempt to control it. 2015-08-29 21:48:58 -04:00
AsamK
2337b468e0 Specify plugins as plugins to qmake 
This way only libPLUGIN.so is generated and not the versioned files
libPLUGIN.so.1.0.0
 2015-08-29 13:12:57 +02:00
Cyril Soler
b8459b3161 Merge pull request #44 from AsamK/improve_qmake 
Improve qmake: "make install" support and ability to change install prefix
 2015-08-26 20:38:27 -04:00