10265 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
csoler	7327f1a98b	fixed deadlock caused by locking the mutex in p3Identity after the one in p3GxsReputation	2017-01-28 15:26:12 +01:00
csoler	f935d9fb76	Merge pull request #669 from csoler/v0.6-ImprovedGUI ... added missing files	2017-01-26 22:48:25 +01:00
csoler	53a1993842	added missing files	2017-01-26 22:46:58 +01:00
csoler	6321bc1818	Merge pull request #668 from csoler/v0.6-ImprovedGUI ... V0.6 improved gui	2017-01-26 22:43:44 +01:00
csoler	339572740b	keep quit button into toolbar	2017-01-26 22:42:24 +01:00
csoler	67af166c0c	moved Options window into a new Preferences tab	2017-01-26 22:35:33 +01:00
csoler	f3caad9e81	Merge pull request #667 from csoler/v0.6-ImprovedGUI ... V0.6 improved gui	2017-01-26 18:16:30 +01:00
csoler	883c4cc8a0	improved AboutWidget a little bit	2017-01-26 09:19:18 +01:00
csoler	1cd64ce0fd	improved EE	2017-01-25 22:41:23 +01:00
csoler	0774f08933	fixed display of about widget	2017-01-25 20:27:53 +01:00
csoler	1cdb970e23	moved the AboutDialog into Options	2017-01-24 22:39:28 +01:00
defnax	f90ebb1dfc	update Person details window used on Statistics. ... clean up look and feel of Friend Details to get more user friendly for normal users.	2017-01-24 16:17:53 +01:00
csoler	ca5fa7afa8	Merge pull request #653 from RetroPooh/master ... chatlobby option to disable sending typing notifications; friend connect wizard minor tweaks	2017-01-23 21:11:22 +01:00
csoler	1d5c536421	Merge pull request #650 from PhenomRetroShare/Add_StatusBarHideOption ... Add StatusBar and its widgets hide options.	2017-01-23 21:04:41 +01:00
csoler	f7a1348370	made Accepted option in Transfers to send tunnel requests for both encrypted and clear tunnels	2017-01-23 19:13:50 +01:00
RetroPooh	8cf5abcb9d	options-network default tab opened changed to first	2017-01-23 21:10:06 +03:00
Phenom	9937513dfd	Add StatusBar and its widgets show options. ... The StatusBar is shown by default.	2017-01-23 18:46:55 +01:00
RetroPooh	091ea055fe	fix previous - forgot .h file	2017-01-23 19:58:31 +03:00
RetroPooh	5dc5496767	add friend dialog - hide email and trust strings if not in advanced mode	2017-01-23 18:31:00 +03:00
RetroPooh	bcb1f19990	friend add wizard - hide options checkboxes in collapsible panel, default on in advanced mode	2017-01-23 15:09:40 +03:00
RetroPooh	e82b4fe3c3	friend connect wizard - add tooltips for checkboxes; hide 40peers warning if you have <30 friends; restored back own cert actions for advanced mode	2017-01-23 00:34:02 +03:00
RetroPooh	58c296c69d	hide typing notification setting in chat options by default	2017-01-23 00:25:17 +03:00
RetroPooh	9268fd5ff0	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2017-01-23 00:21:23 +03:00
csoler	297907ef81	Merge pull request #662 from csoler/v0.6-ImprovedGUI ... V0.6 improved gui	2017-01-22 21:48:48 +01:00
csoler	7da68ff72d	improved certificate parsing in Home so that corrupted certs never get accepted	2017-01-22 21:44:26 +01:00
csoler	214fbc7957	added a friend recommendation menu entry in Home drop menu, and created the dialog to create/send the recommendations	2017-01-22 21:06:11 +01:00
csoler	aa62136f17	Merge pull request #657 from PhenomRetroShare/Add_NoCppWarningFlag ... Add no cpp #warning Config flag to better show other ones.	2017-01-22 19:47:50 +01:00
csoler	dc43611dd4	changed Lobbies into Chat rooms in a few places	2017-01-22 18:52:30 +01:00
csoler	73d9a48366	update client Grp TS even when friend peer is subscribed to no groups, so as to avoid the friend re-sendign an empty list indefinitly (fix suggested by jo)	2017-01-22 18:36:36 +01:00
csoler	baa9713384	partially changed lobby->chat room in displayed strings in the GUI	2017-01-21 21:38:10 +01:00
csoler	3538b0a455	merged upstream/pr/648	2017-01-21 20:56:00 +01:00
csoler	72493ad09f	Merge pull request #658 from PhenomRetroShare/Fix_Compilation ... Fix Compilation	2017-01-21 17:31:06 +01:00
Phenom	1f5ef4cc05	Fix Compilation	2017-01-21 17:29:07 +01:00
csoler	e07d6ff6b1	removed debuginfo from PR 654	2017-01-21 17:26:44 +01:00
csoler	6f7f1c2e65	Merge pull request #656 from PhenomRetroShare/Fix_UnitTestWarnings ... Fix all warnings in UnitTest	2017-01-21 17:16:56 +01:00
Phenom	eee2a7b314	Add no cpp #warning Config flag to better show other ones. ... Use CONFIG+=rs_nocppwarning to qmake command line.	2017-01-21 16:51:49 +01:00
Phenom	aa05d60894	Fix all warnings in UnitTest	2017-01-21 16:31:45 +01:00
csoler	e3240de8e0	Merge pull request #654 from csoler/v0.6-GXS-LimitedSync2 ... V0.6 gxs limited sync2	2017-01-21 15:06:46 +01:00
csoler	9a20160d1e	merged upstream/master	2017-01-21 14:01:53 +01:00
felisucoibi	e95c1319b5	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2017-01-21 00:08:23 +01:00
csoler	ee4d722225	fixed cache deletion of GXS grp meta that caused deleted groups to not come back when available	2017-01-20 23:27: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
RetroPooh	0ca477d01b	add chatlobby option to disable sending typing notifications	2017-01-20 22:26:50 +03:00
csoler	d1af2e09dc	merged with upstream/master	2017-01-20 00:00:47 +01:00
csoler	b52ab0f542	added auto-clean of unused groups when grpAutoSync is enabled (so it does not touch identities)	2017-01-19 23:59:26 +01:00
felisucoibi	39aaca9b87	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2017-01-19 14:45:08 +01:00
csoler	f3b3d2b262	disabled emoticon replacement in GxsChannelPostItem and chat lobby toaster and chat toaster, where there are not needed as compare to how problematic they can be	2017-01-19 14:01:54 +01:00
felisucoibi	73f59c2a42	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2017-01-19 13:58:36 +01:00
csoler	cb61d58b12	disabled emoticon replacement in channel title because it causes channels to load extremely slowly due to the enormous amount of emoticons	2017-01-19 13:49:17 +01:00
csoler	410123b976	added warning about consistency error in idservice group flags	2017-01-19 11:16:47 +01:00