Commit Graph

8323 Commits

Author SHA1 Message Date
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
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
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
Cyril Soler
d50875b9bb Merge pull request #212 from csoler/v0.6-TrafficOptim
V0.6 traffic optim
2015-12-19 21:38:55 -05:00
csoler
141b799c9d removed debug info 2015-12-19 21:20:25 -05:00
Cyril Soler
124da6f3b7 Merge pull request #210 from G10h4ck/pqicleaning
[RFC] Made pqiperson more readable evidence some strange code
2015-12-19 21:12:57 -05:00
Cyril Soler
d2e62b92bc Merge pull request #211 from csoler/v0.6-GxsDebug
V0.6 gxs debug
2015-12-19 19:18:53 -05:00
csoler
462f969da7 merged with upstream/master 2015-12-19 19:15:48 -05:00
csoler
ccc5f0f8fc improved debug info in rsgxsnetservice 2015-12-19 19:04:49 -05:00
csoler
5fcaa36736 fixed some serialising bugs, and added proper notification of observer 2015-12-19 19:00:06 -05:00
csoler
6910ad3695 added stats exchange system to gather number of posts in unsubscribed groups without the need to actually DL the messages (reduced bw a lot) 2015-12-19 17:38:52 -05:00
Gio
b2c27a1fed Made pqiperson more readable evidence some strange code 2015-12-19 22:10:07 +01:00
electron128
adfa94d237 added missing null check libresapi ApiPluginHandler 2015-12-18 19:05:18 +01:00
csoler
b1b75a35a1 fixed stupid bug causing cleanRejectedMessages() to be called continuously 2015-12-18 08:07:00 -05:00
Cyril Soler
374aa65c66 Merge pull request #209 from csoler/v0.6-GxsDebug
added rejection list to gxsnetservice that is fed by calls from GenEx…
2015-12-17 23:10:02 -05:00
csoler
e8b881b2f1 added rejection list to gxsnetservice that is fed by calls from GenExchange system, to avoid infinitely re-downloading rejected messages due to bad reputation, bad signatures, missing ids, etc 2015-12-17 23:08:02 -05:00
defnax
03896d7f8c Added Sorting Menu entry. 2015-12-18 01:40:39 +01:00
electron128
5b63762eef removed useless code which caused lots of ChatId conversation warnings 2015-12-17 18:59:30 +01:00
Cyril Soler
45fb453e92 Merge pull request #208 from csoler/v0.6-GxsDebug
V0.6 gxs debug
2015-12-17 09:23:16 -05:00
csoler
55e66d090c fixed mismatch between API versions causing signed groups created with old API to fail author signature checking 2015-12-17 00:08:08 -05:00
csoler
dc034fe523 removed debug info from GxsNetService 2015-12-15 23:17:35 -05:00