Commit Graph

13008 Commits

Author SHA1 Message Date
csoler
2d03ffa85c
removed tabs from travis file 2019-01-25 15:08:36 +01:00
csoler
51112c8df8
fixed branch name for OSX deploy 2019-01-25 14:48:03 +01:00
csoler
abaeac495e
updated travis file to comply with main repository 2019-01-25 14:43:05 +01:00
csoler
86c8a44c95
merged own travis file to allow travis compilation 2019-01-25 14:38:44 +01:00
csoler
ad45a7781c
removed test for unsigned long in serialization, and added back pragma to avoid strict aliasing error in rstypes.h 2019-01-25 14:23:08 +01:00
csoler
3836ed836b
fixed template problem in memory handle serialization 2019-01-25 10:26:34 +01:00
csoler
64b584cccc
fixed template problem in memory handle serialization 2019-01-25 10:11:09 +01:00
csoler
8ecddc3fa5
compilation experiment 2019-01-25 09:45:21 +01:00
csoler
68c0c65e94
fixed .pri for MacOS 2019-01-24 11:59:31 +01:00
csoler
a8d3df3b83
fixed directory for libmicrohttpd 2019-01-24 11:02:17 +01:00
csoler
f013a43e48
fixed versions for libs in MacOS 2019-01-24 10:16:13 +01:00
csoler
d0bacbd6c2
experimental fix 2019-01-23 21:05:29 +01:00
csoler
bfdca129c5
fixed travis.yml 2019-01-23 20:27:00 +01:00
csoler
4938200bac
fixed merge 2019-01-23 20:25:05 +01:00
csoler
1f81a4cb6f
added 10.13 as compilation target on MacOS 2019-01-23 20:23:10 +01:00
csoler
11abdb7bae
attempt to fix compilation of MacOS 2019-01-23 20:21:44 +01:00
csoler
180ea6c99f
new branch for MacOS release 2019-01-23 20:21:18 +01:00
csoler
bf1c433849
manual merge with upstream/master 2019-01-22 21:32:18 +01:00
csoler
38fa4adc33
Merge pull request #1465 from RetroShare/revert-1464-ui_cleanup
Revert "removed HeaderFrame where it's not needed"
2019-01-19 22:37:45 +01:00
csoler
9c24f5c718
Revert "removed HeaderFrame where it's not needed" 2019-01-19 22:36:19 +01:00
csoler
e34b8e109f
merged with upstream/master 2019-01-19 15:56:33 +01:00
csoler
9017db4797
added identity creation time in IdDetails 2019-01-19 15:54:07 +01:00
defnax
50a217bf9d
Merge pull request #1464 from zapek/ui_cleanup
i dont agree but let see if your mission on rs is only remove what you can?
i want see if you want do real improvements where we need help.
2019-01-19 15:24:58 +01:00
zapek
bb038ab3e0 removed HeaderFrame where it's not needed; changed the font of top
tooltips to be the same
2019-01-18 23:30:52 +01:00
csoler
d143f761cf
Merge pull request #1462 from csoler/v0.6-ImprovedGUI
fixed not working setAsReadOnActivate preferences/forum button
2019-01-14 23:53:04 +01:00
csoler
104e122102
fixed not working setAsReadOnActivate preferences/forum button 2019-01-14 23:51:53 +01:00
csoler
05313a5364
Merge pull request #1460 from csoler/v0.6-ImprovedGUI
V0.6 improved gui
2019-01-13 23:24:28 +01:00
csoler
2de7ac26d5
set minimize to tray icon default to false because some systems do not support it 2019-01-13 23:23:41 +01:00
csoler
fd74123b45
fixed indentation 2019-01-13 15:28:03 +01:00
csoler
c04821d91c
fixed ghost unread forum posts problems by setting read status of all versions of the same post at once. WARNING: this will not remove ghost posts that are already here unless the user reads them again 2019-01-13 15:19:07 +01:00
csoler
8721cb3ab1
Merge pull request #1456 from defnax/master
*Improved Create comment dialog for channel/posted comment replies
2019-01-12 15:05:43 +01:00
csoler
b3ecfe1504
Merge pull request #1458 from csoler/v0.6-ImprovedGUI
V0.6 improved gui
2019-01-12 15:02:06 +01:00
csoler
957435acc7
fixed inconsistent storage/sync values in GxsGroupDialog that caused 1y storage period to not show up 2019-01-12 14:59:58 +01:00
csoler
4eea4ef687
removed Subscribed column in chat room list since it duplicates information. WARNING: RS UI will get confused about previously saved config. Needs 2 restarts to get right 2019-01-12 14:44:46 +01:00
defnax
2fc0c643ef Improved again reply comment dialog
Added frame for better see reply field with white background
Set strings for "Reply as" and for window title
2019-01-12 14:08:31 +01:00
csoler
f6999accf3
fixed wrong denied/accepted label on own key in keyring 2019-01-11 23:46:24 +01:00
csoler
fdf6a32236
disable send Msg to own id in chat rooms 2019-01-11 23:17:09 +01:00
csoler
e92c43f1f7
added missing return comment in rsfiles 2019-01-11 22:14:07 +01:00
csoler
396d58da58
fixed auto-switching bug in GxsIdChooser 2019-01-11 22:13:48 +01:00
csoler
3c4d4e37e9
Merge pull request #1320 from hunbernd/feature/native-dialogs
Added switch to enable native dialogs at compile time
2019-01-11 15:24:21 +01:00
csoler
343ccaa1c5
Merge pull request #1457 from csoler/v0.6-ImprovedGUI
fixed sorting of last time used in keyring
2019-01-10 23:45:06 +01:00
csoler
266edf06aa
fixed sorting of last time used in keyring 2019-01-10 23:43:19 +01:00
Gioacchino Mazzurco
97633ec8db
Fix crash if JSON object deserialization
In case an object was expected while another type was got RsSerializable
JSON deserialization code was crashing, this commit solve the crash in
this not so corner case
2019-01-10 19:06:35 +01:00
defnax
2d096e3179 Improved Create comment dialog for channel/posted comments replies
*Improved Create comment dialog for channel/posted comment replies
*Update forum icons use the new flat one green/black
*Changed the context menu icon for Pin post
*Fixed for "new thread" dialog the title icon
*Added new circle icons for later to use
2019-01-10 00:12:38 +01:00
defnax
59d48b1191
Merge pull request #3 from RetroShare/master
merge changes from master to own fork
2019-01-09 23:45:47 +01:00
defnax
993f1e8ada
Merge pull request #1455 from defnax/master
*Improved Display of Moderator selection box on a useable place
*Restored back changes from circles & profile gen dialog
2019-01-09 23:41:09 +01:00
defnax
868a2a30b6 restored back changes from circles & profile gen dialog
*Restored back changes from circles & profile gen dialog
*Fixed channel frame stylesheet
2019-01-09 22:35:07 +01:00
csoler
b74520cb30
Merge pull request #1454 from csoler/v0.6-ImprovedGUI
added some debug info to GxsIdChooser and fixed a typo (possibly caus…
2019-01-07 13:21:22 +01:00
csoler
b7340ef7ee
fixed case insensitive sorting in Keyring, and cleanup dead code 2019-01-06 20:58:32 +01:00
csoler
ba57ddfef9
added JSon api for file control 2019-01-06 20:56:57 +01:00