Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 19:04:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,288 Commits 63 Branches 22 Tags 195 MiB
334b414335
Commit Graph

8288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sehraf
03d99ae4af made GenCertDislog more generic 2015-09-07 23:55:57 +02:00
sehraf
4fc6c73dd9 replaced some ifs with switch 2015-09-07 23:40:52 +02:00
defnax
e2768e0c87 Added last used field to Person Details Window 2015-09-07 23:34:39 +02:00
sehraf
fed43450ae made server settings more generic and added i2p support 2015-09-07 23:01:24 +02:00
sehraf
95d6b06eb5 first working version 2015-09-07 21:34:10 +02:00
sehraf
0107f4e406 first run on gui integration 2015-09-07 21:34:10 +02:00
sehraf
ba74c04581 removed duplicated code, fixed compile, few additions 2015-09-07 21:34:10 +02:00
sehraf
c17d0e1498 add i2p support to libretroshare 2015-09-07 21:34:10 +02:00
defnax
2c1743f5bb Added send message function for Participants list. 2015-09-07 15:13:32 +02:00
defnax
cc4be39025 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-07 15:08:56 +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
b8e3a434cf Auto download of recommended files adds the sender as source of the download. 2015-09-06 21:28:34 +02:00
thunder2
5f36500d02 Fixed click in column "Friend nodes" in FriendList. 2015-09-06 14:21:05 +02:00
thunder2
869077b4a5 Combined selects in RsDataService::retrieveNxsGrps/RsDataService::retrieveNxsMsgs. 2015-09-06 01:13:27 +02:00
csoler
8bb76c95ac fixed VOIP compilation on ubuntu 14.04 2015-09-05 16:21:49 -04:00
csoler
1de2f01d22 updated ubuntu changelog 2015-09-05 16:21:30 -04:00
thunder2
d4226b6815 Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro 2015-09-05 21:31:38 +02: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
Cyril Soler
cd2dce3e3e Merge pull request #93 from AsamK/pegmark_wiki 
Disable pegmarkdown build by default, only used by disabled wiki
 2015-09-05 09:49:40 -04: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
Cyril Soler
6bc6e22e12 Merge pull request #92 from AsamK/fix_travis_voip 
Fix travis voip
 2015-09-04 21:05:55 -04:00
defnax
e9a5523c54 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-05 00:16:07 +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
Cyril Soler
7385dd12ac Merge pull request #91 from AsamK/fix_opensuse_compile 
Fix opensuse compile
 2015-09-04 13:48:58 -04:00
Cyril Soler
fd19349684 Merge pull request #90 from PhenomRetroShare/Fix_Travis_CI_Compilation 
Fix Travis CI compilation by adding libavutil-dev package.
 2015-09-04 13:48:08 -04: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
6b94248d3b Fix Travis CI compilation by adding libavutil-dev package. 2015-09-04 17:28:45 +02:00
defnax
7f8dae93cf Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-04 16:33:43 +02:00
Thunder
c892f8a3f4 Merge pull request #85 from PhenomRetroShare/Fix_VOIP_CompilWithRecentLibavutil 
Fix VOIP compilation with recent libavutil-dev package.
 2015-09-04 16:31:53 +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
defnax
07c5030c36 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-03 17:41:30 +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
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
csoler
97237c867c merge PR/81, merging with master 2015-09-02 22:43:42 -04: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
Cyril Soler
0b50aa28f3 Merge pull request #80 from AsamK/paste_plain_text 
Add "Paste as plain text" to context menu of RS text edits
 2015-09-02 20:32:23 -04:00
AsamK
feafb1e291 Add "Paste as plain text" to context menu of RS text edits 
Useful for example when pasting from a website
 2015-09-03 00:28:19 +02:00
Cyril Soler
3fbbcd30eb Merge pull request #79 from chozabu/more_travis 
added more details to travis IRC output
 2015-09-02 18:27:51 -04:00