Commit Graph

11356 Commits

Author SHA1 Message Date
felisucoibi
2adde95412 fixed bad uploading of previous pr
using gui of github
2017-05-21 15:08:07 +02:00
csoler
dbc23969f4 Merge pull request #830 from Gottox/fix-libressl
fix building with libressl
2017-05-21 14:52:20 +02:00
felisucoibi
6bc72dd5cf restored start dialog and fixed
I made a mistake using visual editor of github, fixed.
2017-05-21 14:51:43 +02:00
csoler
33ab7faec4 Merge pull request #831 from Gottox/fix-musl
fix building with musl libc
2017-05-21 14:49:13 +02:00
csoler
b341fea170 merged upstream/master 2017-05-21 13:49:41 +02:00
felisucoibi
a5cebb9f1e simplified and upgraded gui logo added 2017-05-21 12:35:43 +02:00
felisucoibi
ecf3fc52fb simplified gui 2017-05-21 12:34:52 +02:00
felisucoibi
d83c42dd98 Add files via upload 2017-05-21 12:33:40 +02:00
Enno Boland
a578acdea8 fix building with musl libc 2017-05-21 10:54:19 +02:00
Enno Boland
2046d9eaae fix building with libressl 2017-05-21 10:48:58 +02:00
defnax
95c9b37479 update background image resolution 2017-05-21 04:12:34 +02:00
csoler
a439fbf63e fixed bug (due to new serializer) that caused a wrong hash to be computed when sending distant messages 2017-05-20 23:01:56 +02:00
csoler
ef59a604d2 Merge pull request #828 from csoler/v0.6-EditPosts
fixed count of unread/new posts by not counting older versions
2017-05-20 22:39:53 +02:00
csoler
162095bf20 fixed count of unread/new posts by not counting older versions 2017-05-20 22:37:31 +02:00
csoler
8b079f8fdf Merge pull request #827 from csoler/v0.6-EditPosts
V0.6 edit posts
2017-05-20 18:34:07 +02:00
csoler
0321037eb8 fixed centering of comments 2017-05-20 18:15:57 +02:00
defnax
7a2807a46e added missed icon 2017-05-20 18:06:23 +02:00
csoler
9da1e1ce05 fixed proper comment number in channels feeds 2017-05-20 17:53:25 +02:00
csoler
51710c10a0 merge comments between channel item versions 2017-05-20 17:33:05 +02:00
defnax
bda7a50621 Improved look & feel for Generate and Login Window 2017-05-20 15:14:43 +02:00
csoler
d79c117ee8 Merge pull request #826 from PhenomRetroShare/Fix_ChatFontSetting
Fix Chat Font setting saving.
2017-05-19 22:12:02 +02:00
Phenom
7acefda943 Fix Chat Font setting saving.
And don't use native dialog.
2017-05-19 18:40:17 +02:00
csoler
6b09fa0f67 allow GxsFeedItems to have versions. Unfinished (does not compile) 2017-05-18 22:31:52 +02:00
Gioacchino Mazzurco
db3dad3e23 Local API binary output support + qml image example 2017-05-18 21:57:24 +02:00
Gioacchino Mazzurco
e59366d0fd Qml app: made contact sorting case insensitive 2017-05-17 15:49:26 +02:00
Gioacchino Mazzurco
97a0e00089 Qml Better debugging for token manager 2017-05-17 15:34:29 +02:00
Gioacchino Mazzurco
c1c1d5ddb4 Qml app: fixed unread messages count displaying
Roles in models are not expected to change type, so they must be always
  defined and have the same type
2017-05-17 15:33:10 +02:00
csoler
d5ec641f9e changing background color as a function of commenter ID (needs to be further adapted to all styles) 2017-05-16 19:45:27 +02:00
csoler
86118d9de6 Merge pull request #823 from csoler/v0.6-EditPosts
made gxs comments multi-lines
2017-05-16 10:26:03 +02:00
csoler
fd136c1a30 made gxs comments multi-lines 2017-05-16 10:24:23 +02:00
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