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
9,950 Commits 63 Branches 22 Tags 194 MiB
1217a85d99
Commit Graph

9950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cyril Soler
0e857096c1 Merge pull request #409 from sehraf/pr-upnp-version 
Add information about the utilized UPnP library
 2016-06-07 11:00:34 -04:00
sehraf
2d5883ccc9 add UPnP lib version 2016-06-07 16:32:23 +02:00
csoler
1c1b7acef6 attempt at fixing the crash when quitting RS (due to operator new not being able to allocate memory from deleted allocator 2016-06-06 22:55:23 -04:00
csoler
54a0ca4678 added line in circle tooltip for visibility. Re-worked tooltip text a little bit 2016-06-05 15:49:33 -04:00
csoler
ee2559620b updated tooltip and names for self-restricted circles to "private" 2016-06-05 15:20:55 -04:00
csoler
195ad4ec8f use grey bullet as a placeholder for circles without pending operations 2016-06-05 15:20:55 -04:00
Cyril Soler
456b57b5c9 Merge pull request #205 from pztrn/master 
Make sure that version_detail.sh script always do 2 things
 2016-06-05 13:17:30 -04:00
Cyril Soler
9f2d6bd5fc Merge pull request #259 from heini/rhel_fedora_qt5 
Switch RHEL family builds to QT5, too.
 2016-06-05 13:02:13 -04:00
csoler
e2e9edecb9 fixed initialization of memebrs in peerDetails 2016-06-05 11:51:47 -04:00
Cyril Soler
f1d69ada82 Merge pull request #351 from PhenomRetroShare/Add_WebUI_ClearButtonOnBradCast 
Add Clear Button on WebUI for BroadCast.
 2016-06-05 11:26:29 -04:00
csoler
f55b283887 second pass over compilation warnings 2016-06-05 11:05:52 -04:00
csoler
927f782bef pass over compiler warnings 2016-06-05 10:43:57 -04:00
csoler
c2ae4fc904 merged upstream/master 2016-06-05 10:06:11 -04:00
csoler
2567feb971 fixed compilation broken by using deprecated Qt method 2016-06-05 09:54:26 -04:00
csoler
a2ca0385db fixed compilation and several problems following separation of public/private keys 2016-06-04 21:39:40 -04:00
defnax
0eb4e9e5be - renamed label "restricted to group" to "restricted to circle" 
- changed icon
 2016-06-04 21:27:20 +02:00
Cyril Soler
b2497ccb2e Merge pull request #406 from sehraf/pr-fixes-#2 
fix build errors (return type is a pointer and not boolean)
 2016-06-04 09:45:17 -04:00
csoler
24f619d62b added missing include for debian squeeze 2016-06-04 03:20:45 +02:00
csoler
d8189d08f7 moved placeholder text from .ui to .cpp to allow compilation with old Qt 2016-06-03 21:14:34 -04:00
defnax
99f54a2ff7 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-06-03 19:16:59 +02:00
defnax
4300d87b3d Set default Header Stylesheet for Circles 2016-06-03 19:15:24 +02:00
csoler
814db7ed55 fixed possible uninitialised memory read 2016-06-03 19:15:16 +02:00
csoler
4c986cdc3e attempt to fix the pthread_setname_np symbol issue. To be tested 2016-06-03 19:04:52 +02:00
sehraf
0d106032de fix build errors (return typ is a pointer and not boolean) 2016-06-03 09:02:19 +02:00
csoler
590be092e5 separated RsTlvSecurityKey into two incompatible classes to enforce the correct usage of private vs. public keys 2016-06-02 23:47:57 -04:00
csoler
53eb4dfb12 fixed compilation errors due to last merge operation 2016-06-02 21:21:18 -04:00
csoler
e2b5785eec merged PR403 with trunk 2016-06-02 21:15:51 -04:00
csoler
10e0254317 fixed a few things to correct PR403 2016-06-02 20:38:33 -04:00
Cyril Soler
699b3cf064 Merge pull request #402 from PhenomRetroShare/Fix_WindowsCompilationWithMksTemp 
Fix Compilation when mkstemp is not defined.
 2016-06-02 20:38:28 -04:00
Cyril Soler
5362fd3413 Merge pull request #401 from PhenomRetroShare/Fix_WindowsCompilationWithThreadName 
Fix Compilation with unknown pthread_getname_np if not __USE_GNU defined
 2016-06-02 20:36:51 -04:00
Cyril Soler
6f5693d1b4 Merge pull request #405 from PhenomRetroShare/Fix_UnitTestsCompilation 
Fix UnitTests Compilation
 2016-06-02 18:26:43 -04:00
Phenom
2c8d047ca4 Fix UnitTests Compilation 2016-06-02 19:34:58 +02:00
Cyril Soler
2f4f44ee48 added early discarding of incoming connection attempt (before SSL handshake) for blacklisted IPs 2016-06-02 09:37:01 -04: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
sehraf
4f60c8cc9b libretroshare: fix comparison between signed and unsigned integer 2016-06-02 14:54:23 +02:00
sehraf
8b788b2aa8 libretroshare: fix member initialisation order 2016-06-02 14:54:16 +02:00
sehraf
cfc0e7071a libretroshare: remove unused variables 2016-06-02 14:54:07 +02:00
Phenom
005af47fe9 Fix Compilation when mkstemp is not defined. 2016-06-01 22:37:05 +02:00
csoler
617a863f12 updated ubuntu changelog 2016-06-01 16:20:25 -04:00
Cyril Soler
7d80160dfb Merge pull request #400 from sehraf/pr-remove-warnings 
remove compiler warnings in libbitdht and openpgpsdk
 2016-06-01 16:16:43 -04:00
Phenom
832fb78a2a Fix Compilation with unknown pthread_getname_np if not __USE_GNU defined 2016-06-01 22:00:44 +02:00
sehraf
ca90f1387d remove compiler warnings openpgpsdk 2016-06-01 21:20:50 +02:00
sehraf
4a07e3cb30 remove compiler warnings libbitdht 2016-06-01 21:20:50 +02:00
Cyril Soler
65585658a5 Merge pull request #399 from sehraf/pr-thread-names-2 
add thread names for the remaning threads
 2016-06-01 11:35:54 -04:00
sehraf
24b3da06ef add names to feedreader threads 2016-06-01 17:01:43 +02:00
sehraf
f9d4a0cbfb add names to gxs threads 2016-06-01 16:47:21 +02:00
sehraf
bc23c2f7b9 add thread names for peers 2016-06-01 16:33:13 +02:00
sehraf
f16ee97093 add static thread names 2016-06-01 16:21:55 +02:00
Cyril Soler
5b67654530 Merge pull request #398 from sehraf/pr-thread-naming 
Introduce thread names to simplify debugging
 2016-06-01 09:44:38 -04:00
sehraf
b3fece25da introduce thread naming 2016-06-01 15:07:41 +02:00