9968 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Cyril Soler	bc04f3c94b	Merge pull request #421 from PhenomRetroShare/Fix_UnitTestCompilation ... Fix UnitTest Compilation	2016-06-18 17:43:50 -04:00
Phenom	43f618fedd	Fix UnitTest Compilation	2016-06-18 23:10:12 +02:00
mr-alice	8e2ff56f9a	merged to upstream/master	2016-06-18 16:59:01 -04:00
csoler	07bda26192	fixed permission matrix widget crash	2016-06-18 16:27:15 -04:00
Cyril Soler	35da9cb193	Merge pull request #419 from PhenomRetroShare/Fix_ChannelNewsFeedWhenComment ... Fix GxsChannelPostItem when received comment.	2016-06-18 15:36:03 -04:00
Cyril Soler	90a27f4e81	Merge pull request #418 from sehraf/pr-improve-debug ... This is the first set of patches to improve RS' logging functionality	2016-06-18 15:33:10 -04:00
Phenom	d84fdff2e1	Fix GxsChannelPostItem when received comment.	2016-06-18 20:10:14 +02:00
sehraf	3cf1968943	fixed p3msgservice.cc	2016-06-18 18:04:18 +02:00
sehraf	d8235c6caf	removed dead code and cleanup	2016-06-18 13:11:21 +02:00
sehraf	09afbbed5d	switched to new rslog method	2016-06-18 13:00:15 +02:00
Cyril Soler	7627bd96ca	Merge pull request #417 from csoler/v0.6-SecurityKeys ... V0.6 security keys	2016-06-17 22:53:05 -04:00
csoler	f57f620111	reduced database testing/cleaning frequency to 31/59 mins.	2016-06-17 22:27:00 -04:00
csoler	eb05922cd1	added a tooltip and read color for unsecure GXS identities. These are still supported for a few weeks at most. So get rid of them	2016-06-17 22:21:06 -04:00
csoler	4df4bb638f	fixed removal of messages in unsubscribed groups	2016-06-17 20:46:58 -04:00
csoler	886d896151	fixed warning about old fingerprint for own keys.	2016-06-17 20:46:24 -04:00
sehraf	f6c5a05c8e	switched to caller providing all needed information instead of saving those on callee side	2016-06-17 11:09:59 +02:00
csoler	cc6ae747cb	fixed color of admin circles (we cannot use a bullet, since bullets are kept for Membership property)	2016-06-16 23:17:56 -04:00
csoler	4d452bf6eb	removed annoying warning in avatar widget	2016-06-16 23:17:56 -04:00
csoler	c25b65074a	removed check key debug info	2016-06-16 23:10:13 -04:00
csoler	25c0c9d4ce	added systematic consistency checking of public/private RSA keys at deserialisation time	2016-06-16 23:06:07 -04:00
csoler	b9ba51f2ba	improved naming of publish/admin rights in GroupTreeWidget	2016-06-16 22:23:27 -04:00
csoler	8d54603b02	fixed bug in private key extraction	2016-06-16 21:27:28 -04:00
csoler	dbd78d2401	merged with upstream/master	2016-06-16 20:19:03 -04:00
sehraf	e28e9720dd	removed dead code	2016-06-16 21:26:58 +02:00
defnax	70662cf8bf	Fixed some layout spacing	2016-06-16 18:41:56 +02:00
Cyril Soler	656e7eb548	Merge pull request #415 from PhenomRetroShare/Add_BuildStatusInReadme.md ... Add Build Status in ReadMe.md file.	2016-06-15 23:27:30 -04:00
Cyril Soler	c7da7342dd	Merge pull request #416 from csoler/v0.6-ContactList ... improved strategy for removal of unused GXS ids with proper constants…	2016-06-15 21:38:14 -04:00
csoler	e63f9361f2	improved strategy for removal of unused GXS ids with proper constants for unknown/signed/known ids. Forbid the stamping of banned keys.	2016-06-15 21:33:27 -04:00
defnax	da11995ca3	Clean up the Chat Toolbar Buttons ... Fixed display of Info Text on PGg details	2016-06-15 23:32:01 +02:00
Phenom	631a29c701	Add Build Status in ReadMe.md file. ... And add AppVeyor File.	2016-06-15 20:53:56 +02:00
csoler	6b74a8a1b6	added missing call to ssl_pendign in pqissludp.	2016-06-14 21:54:24 -04:00
csoler	c3eba4a72d	added missing serialisation call for peer bandwidth limits	2016-06-14 21:54:24 -04:00
csoler	8c44e69012	added output of items which doesnot serialise correctly in pqisslstore	2016-06-14 21:54:24 -04:00
Cyril Soler	ceecdb2771	Merge pull request #414 from PhenomRetroShare/Add_MessageWhenSendingArgToOtherInstance ... Add message, when sending arguments to other instance, to disable this	2016-06-14 20:31:38 -04:00
Cyril Soler	cedce2ecef	Merge pull request #260 from PhenomRetroShare/Add_SendAsPlainText_And_NoEmoteIcon_Button ... Add buttons to send message in plain text and without EmoteIcon.	2016-06-14 20:30:06 -04:00
defnax	69e98b8e2d	Added count Invited Members to Create Circles Dialog. ... Changed some context menu icons for People list and Circles tree. Added icon when im Circle Admin.	2016-06-15 00:08:45 +02:00
Phenom	ddbcd2150c	Add buttons to send message in plain text and without EmoteIcon.	2016-06-14 23:01:08 +02:00
Phenom	9b09187340	Add message, when sending arguments to other instance, to disable this ... option.	2016-06-14 16:49:18 +02:00
Cyril Soler	56e079739c	Merge pull request #413 from csoler/v0.6-Circles ... V0.6 circles	2016-06-13 23:06:10 -04:00
csoler	e03c5dfe56	improved GUI layout in circle creation box. Added tooltips	2016-06-13 22:38:51 -04:00
csoler	600607d879	added warning for old peers in circles	2016-06-13 22:14:09 -04:00
csoler	8b954a240a	added names to upnp redirects to avoid router confusion (patch from ET)	2016-06-13 18:08:05 -04:00
csoler	fa29dd7332	changed the way RsGxsSyncMsgReqItem are sent for circle-restricted groups, using a hash of the group ID instead of encrypting the whole item, hense saving a lot of bandwidth on msg sync.	2016-06-12 21:41:09 -04:00
csoler	972de42864	converted static variable to class member in pqihandler	2016-06-11 18:07:57 -04:00
csoler	34f49d4ae8	removed compilation warning	2016-06-11 18:07:07 -04:00
Cyril Soler	248d0c42d3	Merge pull request #412 from csoler/v0.6-MaxUpRate ... V0.6 max up rate	2016-06-11 17:58:08 -04:00
csoler	ef4455ac9c	cleaned the MaxUpRate branch from unused code	2016-06-11 17:54:11 -04:00
csoler	8e75185060	made avgReadCount and avgSendCound to be uint32_t instead of floats, since they count bytes. Changes kb to 1024 instead of 1000	2016-06-11 17:21:04 -04:00
csoler	eb9025d9a4	removed annoying warning when a circle is empty	2016-06-11 17:20:22 -04:00
csoler	373d41bc63	added missing variable def after previous commit	2016-06-11 14:11:21 -04:00