Commit Graph

8441 Commits

Author SHA1 Message Date
Phenom
c1b88500e0 Fix GenCertDialog masking PGP Key password dialog at end.
Sometimes, at end, when creating new key, the dialog stay behind.
2015-12-28 13:45:58 +01:00
Cyril Soler
00517fe68d Merge pull request #223 from csoler/v0.6-ContactList
V0.6 contact list
2015-12-27 22:22:51 -05:00
csoler
71b3638c36 removed some debug output in distant chat 2015-12-27 22:19:30 -05:00
csoler
a80a6669b6 added notifiction of denying conversation for distant chat 2015-12-27 22:16:04 -05:00
csoler
9dfac71822 connected GUI to distant chat permission flags system 2015-12-27 21:10:20 -05:00
defnax
d287a62318 Merge pull request #221 from PhenomRetroShare/Fix_MacOSX.X_Plugin_Compilation
Fix compilation for plugins but miss RetroShare-gui library linking.
2015-12-28 00:39:58 +01:00
csoler
b32eb6e0c8 added temporal filtering to RSGraphWidget to clear up the display. Auto-changes with scale. Can be changed manually with shift+wheel 2015-12-27 17:00:54 -05:00
defnax
a63482d642 Expand All/Contacts items by default & store/load expand settings. 2015-12-27 19:14:20 +01:00
csoler
672ab256d7 added safeguard against absurdly large packets in rsserial.cc and output of the beginning of the packet. 2015-12-27 10:03:07 -05:00
Phenom
ddec6b1935 Update MacOS_X_InstallGuide.txt 2015-12-26 17:20:54 +01:00
Phenom
cb4579e8c7 Fix compilation for plugins but miss RetroShare-gui library linking.
Get ld: symbol(s) not found for architecture ...
2015-12-26 17:20:54 +01:00
defnax
3ea2e0f450 Merge pull request #222 from PhenomRetroShare/Fix_ColoredFontInChat
Fix colored font in chat.
2015-12-26 16:14:28 +01:00
Phenom
162b5fa2eb Fix colored font in chat.
Colored styles were replaced by emoticons.
2015-12-26 15:57:46 +01:00
csoler
140205108a added backend for distant message and distant chat filtering based on contact list 2015-12-25 22:37:06 -05:00
defnax
f5c2aa31e3 update emotes 2015-12-25 17:23:15 +01:00
defnax
7afcc2a91e Enabled back counting People
Enabled "Sort by Posts" for Channels/Forums/Posted
Fixed Width/Height of Message Composer
Moved Chat Settings Page order.
2015-12-24 17:46:02 +01:00
defnax
12c919491c Added Send Invite Button to People Dialog. 2015-12-24 14:31:52 +01:00
electron128
e3f496f3d9 fixed bug from contact list branch. Identity flags (pgp-linked, contact) where resettet so signed lobbies did not work. 2015-12-24 13:21:40 +01:00
Cyril Soler
f30f71db8e Merge pull request #218 from csoler/v0.6-ContactList
V0.6 contact list
2015-12-23 18:07:10 -05:00
csoler
73f58c79f4 improved layout and namign in MessageComposer 2015-12-23 13:48:56 -05:00
csoler
4c50641700 cosmetic change in IdDialog 2015-12-23 12:12:34 -05:00
csoler
52da8cd0e6 fixed display of contactlist when changing status, and improved computaitonal efficiency 2015-12-23 12:08:20 -05:00
csoler
01839193a6 merged before commit 2015-12-23 11:20:10 -05:00
csoler
98b27d6a2b moved notify calls to RsGenExchange out of RsGxsNetService lock zone, to avoid deadlocks 2015-12-23 11:18:26 -05:00
defnax
15a7487c27 Save sorting on Chat lobby 2015-12-23 16:55:23 +01:00
defnax
226948cab5 Merge pull request #217 from PhenomRetroShare/Fix_CompilationWhenNXS_NET_DEBUG_0
From jolavillette-morkitu: in rsgxsnetservice.cc when #define
2015-12-23 14:08:28 +01:00
defnax
b1ce2faa28 Merge pull request #214 from PhenomRetroShare/Fix_MacOSX.X_Compilation
Fix MacOSX 10.10 Yosemite Compilation
2015-12-23 14:08:01 +01:00
Phenom
1346259411 Miss recomment NXS_NET_DEBUG_0... 2015-12-23 13:45:39 +01:00
Phenom
4aea100e4f From jolavillette-morkitu: in rsgxsnetservice.cc when #define
NXS_NET_DEBUG_0 is set to 1 the compilation fails with:
gxs/rsgxsnetservice.cc: In member function ‘void
RsGxsNetService::updateClientSyncTS()’:
gxs/rsgxsnetservice.cc:1686:117: error: ‘now’ was not declared in this
scope
2015-12-23 13:40:01 +01:00
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05:00
csoler
ab763c7a8a converted file to unix mode 2015-12-22 18:29:27 -05:00
csoler
b7cba226db updated ubuntu changelog 2015-12-22 17:43:37 -05:00
defnax
95d8647a7e Optimized the emoticon selector box size based on how many emoticons are loaded (by anmo), update emotes.acs 2015-12-22 19:57:26 +01:00
Phenom
86b559191e Fix MacOSX 10.10 Yosemite Compilation
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
2015-12-22 17:27:51 +01:00
defnax
334b414335 cleaning up resource file for emojione, removed old smileys 2015-12-22 17:24:12 +01:00
defnax
8e9fe6d800 Merge pull request #189 from hunbernd/feature/chat-enhancements
Chat enhancements
2015-12-22 01:07:02 +01:00
defnax
4ccab411c0 Added new Emojione Emoticons 2015-12-21 22:27:10 +01:00
Gio
436f619fcb getLocalAddresses collects loopback address too 2015-12-21 17:34:53 +01:00
Gio
9d78bba3b8 Guard getLocalAddresses debug 2015-12-21 15:48:59 +01:00
Gio
9826c72969 added rs_inet_ntop crossplatform version of inet_ntop 2015-12-21 15:32:28 +01:00
Gio
ca1a9707ef Removed dead code 2015-12-21 15:31:47 +01:00
Gio
1b2fa3600a Adapted getLocalAddresses() includes for windows 2015-12-21 15:31:46 +01:00
Gio
5a541e7feb Removed unused getLocalInterfaces_ipv4 2015-12-21 09:10:00 +01:00
Gio
77bcc99030 Added sockaddr_storage_dump(...), implemented sockaddr_storage_ipv6_iptostring(...) 2015-12-21 09:10:00 +01:00
Gioacchino Mazzurco
747a03a0b9 Substitute getpreferredinterface flawed logic with simpler getLocalAddresses still just one address used at moment 2015-12-21 09:10:00 +01:00
Cyril Soler
f12b4a1474 Merge pull request #213 from csoler/v0.6-GxsDebug
fixed a number of memory leaks in gxsnetservice. Used a class that au…
2015-12-20 20:53:11 -05:00
csoler
d4926cbc61 fixed a number of memory leaks in gxsnetservice. Used a class that auto-deletes retrieved items. 2015-12-20 20:35:48 -05:00
hunbernd
33b3eb7284 /me style is defined in chat styles 2015-12-21 01:21:04 +01:00
csoler
ea137adc42 fixed compilation on OSX pb in pqistreamer 2015-12-20 19:07:04 -05:00
hunbernd
77804bbf16 Remove location from user name when using /me 2015-12-20 21:31:45 +01:00