Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 11:24:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,125 Commits 63 Branches 22 Tags 195 MiB
6554362035
Commit Graph

8125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
b2dbf9d30a adding missing BIO_free (issue #138) 2015-10-20 18:16:18 -04:00
Cyril Soler
24a685f5a2 Merge pull request #148 from G10h4ck/unsanelan 
Removed flawed logic samenet/samesubnet
 2015-10-20 18:03:06 -04:00
Cyril Soler
5084add2a3 Merge pull request #151 from diversys/master 
Add Haiku support
 2015-10-20 17:56:06 -04:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Gio
16a5eed453 Removed flawed logic samenet/samesubnet you cannot determine if two ip are in the same subnet just from ips the internet is not just a bunch of /24 2015-10-17 10:27:49 +02:00
defnax
febea809b1 Fixed Reputation display, and set text Alignment. 2015-10-17 02:23:46 +02:00
Cyril Soler
8e6c7cd075 changed SSL cert size to 4096 bits as suggested by cave 2015-10-16 12:49:10 -04:00
defnax
66670315dc Moved to display pending packets on a QTreeWidget. 
Fixed People layout/spacing & display votes column.
 2015-10-15 02:14:52 +02:00
csoler
441b164c73 fixed small bugs in average friend reputation display 2015-10-13 21:54:52 -04:00
csoler
410102a7fc fixed bug causing lobby messages signed by IDs linked to unknown PGP keys to be dropped 2015-10-13 21:34:53 -04:00
csoler
525310e5c6 merging 2015-10-13 18:22:01 -04:00
csoler
4f744a6d19 updated ubuntu changlog 2015-10-13 18:21:05 -04:00
electron128
a75cbcd7b3 webui: format time of chat messages 2015-10-13 20:36:00 +02:00
electron128
537c4925b7 libresapi: fixed bug in JSON serialisation of uint32_t, decimal digits had inverse order 2015-10-13 20:35:24 +02:00
electron128
4df3283fcf webui: restored Makefile 2015-10-13 20:27:53 +02:00
Cyril Soler
0b2fdee0a8 Merge pull request #147 from PhenomRetroShare/Fix_ChatWidget_IsTypingLabel 
Fix centered Typing Label on ChatWidget.
 2015-10-13 14:23:31 -04:00
Phenom
245a2826c6 Fix centered Typing Label on ChatWidget. 2015-10-13 20:11:30 +02:00
Cyril Soler
477c11e7ac Merge pull request #146 from PhenomRetroShare/FixVOIP_VividCompilation 
Fix VOIP Compilation on Vivid
 2015-10-13 13:51:23 -04: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
791f5fe886 Fixed ID Details Dialog with Reputation 2015-10-13 02:18:41 +02:00
defnax
58bd186c23 Set a default stylesheet padding size for the Accept/Decline buttons 2015-10-13 00:38:46 +02:00
defnax
e9241933bf Merge pull request #144 from PhenomRetroShare/FixVOIP_HeightOfToolBarForWindowsInFullScreen 
Fix the height of the ToolBar in VOIP FullScreen for Windows.
 2015-10-12 23:42:56 +02:00
defnax
5dbd84bae7 Merge pull request #145 from PhenomRetroShare/Fix_Win32CompilationForPR#143 
Fix Compilation on Win32 after PR#143 merged.
 2015-10-12 23:38:05 +02:00
Phenom
47c47d144e Fix Compilation on Win32 after PR#143 merged. 2015-10-12 23:21:17 +02:00
Phenom
7bc6fdfdee Fix the height of the ToolBar in VOIP FullScreen for Windows. 2015-10-12 23:17:00 +02:00
Cyril Soler
0120234f92 Merge pull request #143 from csoler/v0.6-Reputations 
V0.6 reputations
 2015-10-12 15:06:12 -04:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
f18cc8295e fixed up constants for reputation system, now that is has been tested 2015-10-12 14:22:51 -04:00
csoler
e6bb3073bd added update for forum messages list when an author gets banned 2015-10-12 14:04:23 -04:00
csoler
7dc59845e9 added update for forum messages list when an author gets banned 2015-10-12 14:03:53 -04:00
defnax
022ac105f8 Merge pull request #141 from PhenomRetroShare/AddVOIP_ReactivateSoundEvents 
Reactivate SoundEvents in VOIP.
 2015-10-12 18:58:12 +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
csoler
86b47d818b reduced icon size a little bit in GxsTreeWidgetItem 2015-10-12 10:58:24 -04:00
csoler
5a3756f058 fixed bug on reputation cutoff. Updated tooltips 2015-10-12 10:41:48 -04:00
csoler
36101a977d fixed small bug preventing msg exchange 2015-10-12 00:28:21 -04:00
csoler
82c16c6a27 fixed GUI tooltips over banned items. Added dropping of messages from banned identities in chat lobbies 2015-10-11 22:08:19 -04:00
csoler
1a76bea6ff enabled bannign button in forums, and disable message passing for banned users 2015-10-11 21:41:35 -04:00
Cyril Soler
ad4dabfbf7 Merge pull request #140 from PhenomRetroShare/AddVOIP_Accept,RingAndHangUp 
Add Accept, Ring and HangUp event for Video and Audio.
 2015-10-11 13:31:54 -04:00
csoler
ebe48f495d added proper memory release after mallocs in distant chat (SVN bug 383) 2015-10-11 11:12:11 -04:00
csoler
e309dd6fed fixed banning users from forum threads 2015-10-11 10:00:11 -04:00
Phenom
6a3f4ce87c Update Toaster when ringing. 2015-10-11 10:31:06 +02:00
csoler
f750818402 added proper icons and names for banned users 2015-10-10 21:25:06 -04:00
csoler
68ca57ce75 added removal of messages frm banned users 2015-10-10 18:27:15 -04: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
1a229ef817 Fixed to display GXS ID item with a better icon size 2015-10-10 14:16:12 +02:00
csoler
59d2ca9c3d fixed bug causing uninitialised friend average reputation to be shown 2015-10-09 18:55:07 -04:00
csoler
338fcee865 added button in forums to flag poster identity as bad 2015-10-09 18:51:16 -04:00
csoler
ce96e88925 debugging of reputation system 2015-10-09 17:51:10 -04:00
defnax
ffb8f73357 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-10-09 12:07:23 +02:00