csoler
|
b341fea170
|
merged upstream/master
|
2017-05-21 13:49:41 +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 |
|
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 |
|
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 |
|
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 |
|