11176 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
csoler	b9d19c2a60	Merge pull request #822 from csoler/v0.6-EditPosts ... V0.6 edit posts	2017-05-15 22:17:26 +02:00
csoler	2bc36bc06c	properly merge new version feed items in channels when some items are already present	2017-05-15 22:13:36 +02:00
csoler	84e588b7e0	switch file to REMOTE state in subfileitem if the attachment has already been checked in the past but the file is not here anymore	2017-05-15 21:37:22 +02:00
csoler	635918e735	Merge pull request #821 from G10h4ck/v0.6-GxsTransport ... Fix GxsTrans related serialization regressions	2017-05-15 20:09:58 +02:00
Gioacchino Mazzurco	de9a44fac7	Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha	2017-05-15 19:16:08 +02:00
Gioacchino Mazzurco	10ec52718d	Fix GxsTrans related serialization regressions	2017-05-15 19:13:29 +02:00
Gioacchino Mazzurco	745462a61b	Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha	2017-05-15 15:05:07 +02:00
Gioacchino Mazzurco	93a6b7dcd4	Fix serialization regression in async chat	2017-05-15 15:00:21 +02:00
thunder2	d335d45b82	Fixed build script for Windows	2017-05-15 09:43:47 +02:00
csoler	32b7003d49	Merge pull request #820 from csoler/v0.6-EditPosts ... hide download buttons when the file is local in sub file item	2017-05-14 21:44:08 +02:00
csoler	18e37deba0	hide download buttons when the file is local in sub file item	2017-05-14 21:41:26 +02:00
csoler	1824da11b0	Merge pull request #819 from csoler/v0.6-EditPosts ... V0.6 edit posts	2017-05-14 21:29:04 +02:00
csoler	f832f3dc82	added delete button to channel attached files	2017-05-14 21:26:45 +02:00
csoler	af57545501	removed unused button in GxsChannelPostsWidget	2017-05-14 20:59:43 +02:00
csoler	9077d8087a	Merge pull request #817 from csoler/v0.6-EditPosts ... V0.6 edit posts	2017-05-14 17:52:40 +02:00
csoler	2f43927634	Merge pull request #698 from G10h4ck/gxs_mail_experiments ... [RFC] [C++11] Provide a GXS based transport, use it in mail and chat async delivery	2017-05-13 21:13:24 +02:00
csoler	c0c5cc52db	Merge branch 'master' into gxs_mail_experiments	2017-05-13 21:08:16 +02:00
csoler	01bb4b09a9	added ifdefs around debug info and fixed a few bugs in channel post edit	2017-05-13 20:41:56 +02:00
csoler	6859e0d8ca	fixed post replacement algorithm in channel editing	2017-05-13 17:13:05 +02:00
Gioacchino Mazzurco	022c5459d4	Qml app: show contact details when avater clicked	2017-05-13 12:52:45 +02:00
Gioacchino Mazzurco	0b82b73131	Qml app: fixed import/export of plain certificate ... Added TimedPopup that is a common use case so it is reusable without code duplication	2017-05-13 11:43:31 +02:00
csoler	659e3c949b	merged upstream/master	2017-05-12 23:55:09 +02:00
csoler	305c5d6deb	added collapsing of new versions of channel posts	2017-05-12 23:54:02 +02:00
defnax	2f17a80103	added missed icons	2017-05-12 21:39:50 +02:00
defnax	837fcd7989	Added Placeholder text for Password field, removed "Password:" label.	2017-05-12 18:29:39 +02:00
csoler	5044ac12ca	moved the edit button from top bar to each channel post	2017-05-11 23:44:57 +02:00
csoler	5406da92fa	first part of channel post editing	2017-05-11 23:21:13 +02:00
csoler	38d07430b7	used more saturated colors in stats graph	2017-05-11 21:22:07 +02:00
csoler	7a19deea03	small fix to statistics view	2017-05-11 21:22:07 +02:00
csoler	eb30af57bd	improved display in bw statistics	2017-05-11 21:22:07 +02:00
defnax	d73e850122	look n feel improvements	2017-05-11 18:14:21 +02:00
csoler	7eb5e8e02b	added warning when switching opmode status to non turtle for the first time	2017-05-10 21:37:40 +02:00
Phenom	1ff1b8960f	Save last state of OpMode status bar droplist and restore it at start. ... Add colored style sheet to OpModeStatus ComboBox. And defined default color when stylesheet file are not found.	2017-05-10 21:37:40 +02:00
csoler	3cc79fb242	Merge pull request #774 from PhenomRetroShare/Fix_LobbyTopic ... Fix Lobby Topic not send on invite.	2017-05-10 20:00:42 +02:00
csoler	af18e4c314	Merge pull request #816 from PhenomRetroShare/Fix_StartPasswordFocus ... Fix Start page password focus.	2017-05-10 19:34:53 +02:00
Phenom	6ffae36242	Fix Start page password focus. ... And readd "log in" button.	2017-05-10 19:06:03 +02:00
csoler	11708c8a34	Merge pull request #814 from csoler/v0.6-ImprovedGUI ... prevent to remove old forum messages that have follow-ups.	2017-05-09 22:44:00 +02:00
csoler	bd9a8ae3aa	prevent to remove old forum messages that have follow-ups.	2017-05-09 22:39:15 +02:00
csoler	5d7d8c0653	Merge pull request #813 from csoler/v0.6-ImprovedGUI ... fixed bug causing edited posts to turn into missing messages when the…	2017-05-09 21:56:22 +02:00
csoler	52a0aea0dc	fixed bug causing edited posts to turn into missing messages when they have submessages	2017-05-09 21:33:02 +02:00
csoler	0edbc261a6	Merge pull request #812 from PhenomRetroShare/Fix_TextColorGrayForumThread ... Fix text's color gray in Forum thread when selected.	2017-05-09 19:34:48 +02:00
Phenom	a5386eb6ea	Fix text's color gray in Forum thread when selected.	2017-05-09 19:19:28 +02:00
csoler	0af05d2517	patch to avoid re-asking for rejected plugins when the executable is upgraded.	2017-05-09 19:07:17 +02:00
csoler	88525e48c5	Merge pull request #811 from PhenomRetroShare/Add_OpenCertFileInHomeAddFriend ... Add Open Cert File in Home Add Friend wizard.	2017-05-09 18:55:28 +02:00
Phenom	237db96e7a	Add Open Cert File in Home Add Friend wizard.	2017-05-09 18:50:06 +02:00
csoler	34dd68d7bf	Merge pull request #809 from csoler/v0.6-FT ... fixed previous commit	2017-05-08 23:05:16 +02:00
csoler	e0cb0f4847	fixed previous commit	2017-05-08 23:04:04 +02:00
csoler	9a0df3f757	Merge pull request #804 from PhenomRetroShare/Fix_Warnings ... Fix warnings	2017-05-08 22:21:28 +02:00
csoler	9a7f78f1c7	Merge pull request #805 from PhenomRetroShare/Fix_Commit_#77adc82 ... Fix Commit #77adc82	2017-05-08 22:18:51 +02:00
csoler	caa36b4623	Merge pull request #807 from PhenomRetroShare/Fix_ToasterPositionSetting ... Fix Toaster Position Setting.	2017-05-08 22:17:09 +02:00