Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,834 Commits 63 Branches 22 Tags 194 MiB
a3e8b967a9
Commit Graph

5661 Commits

Author SHA1 Message Date
csoler
b2e37fe47e Merge pull request #773 from csoler/v0.6-Identity 
V0.6 identity
 2017-04-15 20:24:06 +02:00
csoler
273aae7cc1 fixed sharing of own identity 2017-04-15 19:01:13 +02:00
csoler
3130ec9041 added GUI async call to ID serialised data. Allows to copy+paste identities. 2017-04-10 20:02:14 +02:00
electron128
4c9b62070f fixed --base-dir command line argument in rs-gui when running multiple instances. 
Only forward "link" and "rsfile" arguments to a running instance.
Start a new instance if other arguments are present.
 2017-04-09 10:26:18 +02:00
electron128
7f12ca266b fixed name of local socket where RS waits for rslinks etc. 2017-04-09 09:57:48 +02:00
csoler
54cd402f1c fixed a few bugs in latest identity link code 2017-04-08 21:43:07 +02:00
csoler
6d290389f0 added RSLink for GXS identities 2017-04-08 21:12:48 +02:00
Phenom
f175533d8d Fix comment view when they have line return. 
Before, they grow row height but only show 2 lines.
Now, height stay at one line, but tooltip show the correct message.
 2017-04-08 14:06:47 +02:00
csoler
dbcf2d2149 Merge pull request #756 from RetroPooh/guistuff 
minor gui stuff
 2017-03-25 20:27:18 +01:00
csoler
ccb632a442 Merge pull request #749 from PhenomRetroShare/Fix_WindowsHeightAtFirstStart 
Fix windows height at first start.
 2017-03-25 19:26:12 +01:00
RetroPooh
f5e7217bb4 statistics - router - fix bold marking for tunnel speeds over 1mbs 2017-03-21 17:24:59 +03:00
RetroPooh
85cfda1963 add tree item counters for channels,forums,posted 2017-03-21 16:52:40 +03:00
RetroPooh
50c81d7142 chat lobby list - mark signed lobbies with color 2017-03-21 16:41:39 +03:00
RetroPooh
000dabfaed chat lobby list - add tree item counters 2017-03-21 15:02:46 +03:00
RetroPooh
19bd51dfae searchdialog - mark current downloads green 2017-03-21 14:57:06 +03:00
csoler
ca0521cb2d allowed to edit subject hen editing forum posts. Only the latest subject is visible 2017-03-16 21:01:27 +01:00
Phenom
107d48f1b8 Fix windows height at first start. 2017-03-15 23:00:22 +01:00
csoler
2046dbede9 merged latest fixes from official 0.6.2 release branch 2017-03-15 20:53:01 +01:00
csoler
e4fad4530d fixed layout in ConfCertDialog, removed overnumerous tabs 2017-03-15 20:51:40 +01:00
csoler
21143742fd fixed update of Tor proxy address in hidden nodes server page 2017-03-15 19:26:07 +01:00
csoler
44f297156e Merge pull request #682 from csoler/v0.6-EditPosts 
V0.6 edit posts
 2017-03-14 20:04:22 +01:00
Gioacchino Mazzurco
2630ed4573 Merge branch 'master' into gxs_mail_experiments 2017-03-13 22:57:33 +01:00
thunder2
733b1143ba Updated languages from Transifex 2017-03-10 15:57:40 +01:00
mestaritonttu
999e845bdf Fix grammar 2017-03-08 13:17:34 +02:00
csoler
e6cf628fb3 Merge pull request #740 from RetroPooh/trstats 
router stats - mark active tunnels bold
 2017-03-07 21:58:59 +01:00
csoler
283a2ee5fe Merge pull request #717 from PhenomRetroShare/Fix_SettingListWidth 
Fix Setting list width.
 2017-03-07 21:54:56 +01:00
csoler
bbc27b2265 Merge pull request #736 from mestaritonttu/patch-18 
Added whitespace to strings
 2017-03-07 21:53:21 +01:00
csoler
ed22b48db9 Merge pull request #738 from mestaritonttu/patch-20 
Various improvements and fixes to strings
 2017-03-07 21:51:51 +01:00
csoler
376be42950 Merge pull request #739 from mestaritonttu/patch-21 
Improvements and typo fixes in strings
 2017-03-07 21:51:13 +01:00
csoler
b3578f6a46 Merge pull request #734 from mestaritonttu/patch-16 
Remove whitespace from string
 2017-03-07 21:50:20 +01:00
csoler
d9c084bc0d Merge pull request #730 from mestaritonttu/patch-12 
Fix grammar
 2017-03-07 21:49:52 +01:00
csoler
ec21698dcd Merge pull request #727 from mestaritonttu/patch-9 
Added period
 2017-03-07 21:48:30 +01:00
csoler
7d8e06b050 Merge pull request #732 from mestaritonttu/patch-14 
Clarify sorting by posts
 2017-03-07 21:47:43 +01:00
csoler
f3e29bd754 Merge pull request #731 from mestaritonttu/patch-13 
Fix grammar
 2017-03-07 21:47:00 +01:00
csoler
17c44db7e1 Merge pull request #733 from mestaritonttu/patch-15 
Fix typo
 2017-03-07 21:46:21 +01:00
csoler
5f9f0617e5 Merge pull request #735 from mestaritonttu/patch-17 
ASCII uppercase
 2017-03-07 21:45:50 +01:00
csoler
8881a44db6 Merge pull request #737 from mestaritonttu/patch-19 
Remove extra your
 2017-03-07 21:45:11 +01:00
csoler
160c289e6f Merge pull request #728 from mestaritonttu/patch-10 
Removed extra "to"
 2017-03-07 21:44:42 +01:00
RetroPooh
d3f0f9dde3 router stats - mark active tunnels bold 2017-03-07 17:50:13 +03:00
mestaritonttu
87f9dba211 Improvements and typo fixes in strings 2017-03-07 14:05:21 +02:00
mestaritonttu
222cf48c8f Various improvements and fixes to strings 2017-03-07 14:03:05 +02:00
mestaritonttu
83283d9031 Remove extra your 2017-03-07 13:58:43 +02:00
mestaritonttu
7005126f56 Added whitespace to strings 2017-03-07 13:57:10 +02:00
mestaritonttu
6ec5415762 ASCII uppercase 2017-03-07 13:55:02 +02:00
mestaritonttu
28d2e27a4c Remove whitespace from string 2017-03-07 13:53:08 +02:00
mestaritonttu
931531b1a0 Fix typo 2017-03-07 13:51:28 +02:00
mestaritonttu
65c7ca744e Clarify sorting by posts 2017-03-07 13:49:57 +02:00
mestaritonttu
21b78618f3 Fix grammar 2017-03-07 13:48:14 +02:00
mestaritonttu
ba18fcdc27 Fix grammar 2017-03-07 13:45:31 +02:00
mestaritonttu
a4c2015507 Fix typos 2017-03-07 13:41:45 +02:00
mestaritonttu
6b4f7e3d2f Removed extra "to" 2017-03-07 13:39:39 +02:00
mestaritonttu
b4445675ec Added period 2017-03-07 13:34:53 +02:00
csoler
a5182252af Merge pull request #716 from felisucoibi/master 
Renamed settings name sections now they are the same as buttons
 2017-03-07 11:27:17 +01:00
Phenom
dc65d3fe0a Fix Setting list width. 2017-03-06 21:19:41 +01:00
thunder2
0316c8c5ae Added workaround for crash on Windows 7 for Qt versions with gcc 5.3.0. 
The call to GetProcAddress in openssl (cryptlib.c) finds an function pointer to the not existing function _OPENSSL_isservice in the executable running on Windows 7.
 2017-03-06 06:34:06 +01:00
csoler
313e1b3402 updated translation files 2017-03-05 20:10:01 +01:00
csoler
fbd72ddf73 fixed settings SoundPage 2017-03-05 13:57:49 +01:00
felisucoibi
15bb0ff416 Update ChatPage.h 2017-03-05 02:45:37 +01:00
felisucoibi
951820f1d1 Update ForumPage.h 2017-03-05 02:45:07 +01:00
felisucoibi
63174aa14e Update PostedPage.h 2017-03-05 02:44:18 +01:00
felisucoibi
ca75515541 Update MessagePage.h 2017-03-05 02:43:40 +01:00
csoler
b14e4d50cf removed memory leak due to missing delete for BWGraph 2017-03-04 21:08:10 +01:00
csoler
0024ddfe1e fixed utf8 bug in ShareManager 2017-03-04 16:39:39 +01:00
csoler
931442a0c2 fixed compilation 2017-03-04 00:07:51 +01:00
csoler
b4e0a8f836 removed unused file DirectoriesPage.{cpp,ui,h} 2017-03-04 00:04:52 +01:00
csoler
e25756316d merged Directories settings page into Transfers and renamed it Files 2017-03-04 00:01:21 +01:00
csoler
b82a18ee64 hide add cert file button 2017-03-03 22:41:32 +01:00
csoler
556aae6ce7 Merge pull request #711 from RetroPooh/test2 
homepage: add webhelp and move quickstartwizard from settings general
 2017-03-03 22:37:16 +01:00
RetroPooh
d6870b45e9 homepage - add friend from cert file button 2017-03-04 00:12:36 +03:00
Phenom
1584b7773e Fix NAT Display setting saving. 2017-03-03 20:35:18 +01:00
RetroPooh
cb960a358d add webmail invite option to homepage dropmenu 2017-03-03 22:31:23 +03:00
RetroPooh
76ab91f258 quick config on homepage hidden until rework 2017-03-03 20:11:34 +03:00
RetroPooh
47b836d68e people window fix layout compression on resize 2017-03-03 19:49:56 +03:00
RetroPooh
d36096896e forum post dialog - hide obsolete sign option 2017-03-03 16:59:18 +03:00
felisucoibi
c7115da408 CHANGED ORDER IN SETTINGS 
To be in same order than the buttons in menu.
 2017-03-03 14:23:50 +01:00
csoler
cdb0c6e59e fixed [No title] text in people 2017-03-02 22:35:21 +01:00
csoler
1e1fe7708f fixed styles loading in chat. Added missing history/compact/colored style 2017-03-02 22:30:51 +01:00
csoler
d053400914 attempt to fix problems with chat styles 2017-03-02 20:30:54 +01:00
RetroPooh
328168d9a7 add space after quoting sign 2017-03-02 20:03:16 +03:00
RetroPooh
fc0cfc0f2d id edit dialog - tag functions hidden (unfinished) 2017-03-02 19:57:21 +03:00
RetroPooh
c9ddd04925 channel item display layout fix correct comments view 2017-03-02 19:00:54 +03:00
RetroPooh
939b5b4ad0 fix channel item display layout 2017-03-02 18:08:35 +03:00
RetroPooh
e408751919 newsfeed item layout for new channel made uniform with forums 2017-03-02 15:49:12 +03:00
defnax
ff5f3df1ac Fixed default Layout size, it was to big for small screens. 2017-03-02 01:38:11 +01:00
Gioacchino Mazzurco
08161db43b PopupDistantChatDialog fix some strings 2017-03-02 00:08:12 +01:00
Gioacchino Mazzurco
953b70fbe4 Improve async distant chat, fix chat msg receiving 
DistantChatService::initiateDistantChatConnexion(...) made notification
  message optional (enabled by default)
p3ChatService removed duplicion avoidance as it is not necessary
p3ChatService::sendStatusString(...) send status only if peer is online
protect p3ChatService::mDistantGxsMap with mutex as operation on it may
  be done by different threads
p3ChatService::receiveGxsMai(...) set chat message item peer id with
  distant tunnel id, so it is recognized as a distant message later
made p3GxsTunnelService::makeGxsTunnelId(...) static as it need no
  access to this, now it can be used easier by other components
rename RsGxsMailItem::recipientsHint to recipientHint as for now only
  one recipient is possible (TODO: update documentation too)
GxsMailsClient::receiveGxsMail(...) changed paramethers for better
  abstracion, now destination id is passed too because it is usually a
  very useful information
ChatWidget some adaptation to async chat, a couple of method have been
  deprecated too
PopupDistantChatDialog::updateDisplay(...) adapt message shown to the
  user to the new async chat paradigm (TODO: need review)
 2017-03-01 23:31:13 +01:00
csoler
ea2c832bb5 attempt to sort out chat style config issus 2017-03-01 22:54:46 +01:00
csoler
f8b3194343 Merge pull request #705 from PhenomRetroShare/Fix_NewWarnings 
Fiw New Warnings
 2017-03-01 22:43:51 +01:00
csoler
b596791973 improved wording in keyring 2017-03-01 22:33:01 +01:00
csoler
0fea0e0bfe fixed sorting by last time used in keyring 2017-03-01 22:25:57 +01:00
csoler
006e5423db fixed auto-expanding of nodes in friend list 2017-03-01 21:18:16 +01:00
RetroPooh
5618358bf1 homepage quickstartwizard webhelp 2017-03-01 22:36:36 +03:00
Phenom
e4dbc46b34 Fiw New Warnings 2017-03-01 19:43:34 +01:00
csoler
91f2cf720f fixed typo 2017-03-01 19:12:32 +01:00
csoler
40c14db5ea fixed wrong passwd html text 2017-03-01 19:10:45 +01:00
csoler
e081567fbc fixed empty names in header drop menu 2017-03-01 19:08:20 +01:00
csoler
a8adf8d494 fixed names in FriendList for details 2017-02-28 23:05:19 +01:00
RetroPooh
c078d93029 people header fix layout so invite panel does not obstruct the name 2017-02-28 22:56:24 +01:00
RetroPooh
b52c4b80dd GenCertDialog fix min 3 letters length, fields rearrange for sequential display on advanced switch 2017-02-28 22:49:27 +01:00
RetroPooh
d427182e1f fix gxs storage period 1year to 372 days to match old clients 2017-02-28 22:47:38 +01:00
RetroPooh
62a0ccd5e0 QuickStartWizard fixed reset hidden mode 2017-02-28 22:44:49 +01:00
RetroPooh
da41343899 add friend wizard - refinements for hidden nodes 2017-02-28 22:32:43 +01:00
RetroPooh
03b5fb663e add chatlobby splitter position saving 2017-02-28 22:31:36 +01:00
csoler
53186ee3ce set proper default options in make friend dialog, and hide the frame showing own cert since it is not needed anymore 2017-02-28 22:20:52 +01:00
csoler
4abf2c6bf1 hide the feed option button until we figure out how to do it properly. Also fixed the crash when showing network settings on hidden nodes 2017-02-28 21:41:45 +01:00
csoler
bd8189ccdf added test to prevent msgs with a different name to be used as different version 2017-02-28 18:05:44 +01:00
csoler
9d3df7c01f added signal blocking calls to a few last config pages 2017-02-28 00:10:54 +01:00
Phenom
8caeda9c53 Fix missing signals blocking calls in Notify config page. 2017-02-27 23:41:31 +01:00
csoler
88afe51f3e added missing signal blocking calls in several config pages 2017-02-27 23:14:05 +01:00
Phenom
064202296d Fix Notify Settings 2017-02-27 23:01:07 +01:00
csoler
30c4dfe218 prevent port values to go below 1024 in the GUI 2017-02-27 22:35:24 +01:00
csoler
ee9fbefd76 added signal blockign trick for widgets, and fixed the bug causing wrong values to be displayed in server settings 2017-02-27 22:29:01 +01:00
csoler
e7a7c171be fixed bug preventing circle creation. 2017-02-27 21:10:42 +01:00
Gioacchino Mazzurco
c51ee19e8f Some consistence fixes in GUI 2017-02-26 21:41:45 +01:00
csoler
763f2271a8 merged upstream/master into v0.6-EditPosts branch 2017-02-26 20:39:40 +01:00
csoler
99cf69a98c Merge pull request #703 from RetroShare/v0.6-ImprovedGUI 
V0.6 improved gui
 2017-02-26 20:14:34 +01:00
csoler
158d421050 fixed graphical bug in AboutWidget 2017-02-26 18:27:39 +01:00
Phenom
3452821fb9 Add Shift+Enter to create new line in chat widget when Ctrl+Enter option 
is disabled. Proposed by MMT1

In the same time I fix the completer only when chat is lobby.
 2017-02-26 11:31:43 +01:00
csoler
3230e55f04 added some delay in the showHelp() feature 2017-02-26 00:16:36 +01:00
csoler
12246e369b added settings variable to allow to always display the help of each tab the first time it is shown 2017-02-25 23:52:57 +01:00
csoler
dc51911fce added welcome message to show on first start in HomePage 2017-02-22 23:55:29 +01:00
csoler
fe2059fb07 fixed update of GxsGroupWidget layout when changing options 2017-02-22 22:44:00 +01:00
csoler
0e57874ad3 fixed loading of settings::Server page 2017-02-22 22:22:50 +01:00
csoler
27db797a9f fixed show/hide buttons in appearance settings page 2017-02-22 22:06:00 +01:00
csoler
f9f79d4306 removed some mentions to PGP 2017-02-16 10:17:29 +01:00
csoler
dcab611d77 improved layout of Home page 2017-02-16 09:53:54 +01:00
csoler
3c75135f91 pass over AppearancePage to fit to the removal of tool buttons 2017-02-15 21:50:53 +01:00
csoler
7c8f8efbad pass over settings to improve layouts 2017-02-15 21:30:49 +01:00
csoler
391ef3e4c6 improved passphrase window 2017-02-15 19:25:46 +01:00
csoler
b81764893a fixed a few bugs in cert creation window 2017-02-15 19:17:41 +01:00
csoler
59f428f096 fixed the update of check icons in genCertDialog 2017-02-12 23:35:43 +01:00
csoler
5069ba86dd improved style/layout of gen cert dialog 2017-02-12 21:45:22 +01:00
csoler
ccacba797f added pgp passphrase temporary caching in order to avoid re-asking for password at location creation time 2017-02-12 15:27:13 +01:00
csoler
f3824f2348 merged upstream/master 2017-02-11 10:46:51 +01:00
csoler
22f2edb5ad removed debug info and added comment 2017-02-11 10:45:30 +01:00
csoler
5bf8376dd1 fixed a few more bugs in post version UI 2017-02-09 21:49:24 +01:00
csoler
8deeec61c5 fixed UI for post versions 2017-02-09 18:45:55 +01:00
csoler
b93130ac77 fixed a few bugs in post version collecting 2017-02-09 16:15:35 +01:00
csoler
f8056e5751 added collection of older posts versions. 2017-02-09 14:49:43 +01:00
csoler
6681985634 merged upstream/master 2017-02-08 20:40:47 +01:00
csoler
c61ccda431 fixed compilation problem caused by a bug in qtcreator global replace. Warning: always check the result of qtcreator global replace 2017-02-07 22:04:07 +01:00
csoler
37f3e1a62a fixed problem in ID creation code. 2017-02-07 20:15:55 +01:00
defnax
9226ccc5ca Added invite info frame for Friend Request Messages. 2017-02-07 17:01:36 +01:00
csoler
90594bc9a6 Merge pull request #679 from csoler/v0.6-QtOptim 
rewrote forum loading method with the proper logarithmic containers
 2017-02-06 23:59:17 +01:00
csoler
32b2cdaa99 Merge pull request #678 from PhenomRetroShare/Fix_DisableSysTrayToolTipOption 
Fix DisableSysTrayToolTip Option
 2017-02-06 23:57:50 +01:00
csoler
6a9b697e42 made RsReputation::overallReputationLevel() to also return the identity ownership flags so that we dont need to rely on async calls to p3IdService to get them 2017-02-06 23:46:01 +01:00
csoler
013eb93f70 rewrote forum loading method with the proper logarithmic containers 2017-02-06 00:11:26 +01:00
hunbernd
d1328f4467 Fix spaces between emoticons in message composer and forum 2017-02-05 22:09:39 +01:00
hunbernd
d0ab10cc38 Fix slow emoticons by using generic regex rules where possible. 2017-02-05 22:06:36 +01:00
Phenom
865a5741b2 Fix DisableSysTrayToolTip Option 2017-02-05 14:34:33 +01:00
csoler
dfcb66db8c added spinbox to show older versions 2017-02-03 13:02:53 +01:00
csoler
777a73e528 added GUI for editing forum messages 2017-02-03 12:48:51 +01:00
csoler
80e6742ab5 teaking of the css file 2017-02-03 11:45:00 +01:00
csoler
389eff0400 improved the qss and look of login window 2017-02-02 22:05:28 +01:00
csoler
a9b7ed31a1 attempt to make the login creation window look better 2017-02-02 21:48:18 +01:00
defnax
3baaae7a88 Fixed People Header Text color 
Moved info frame for Invite to Top Header
 2017-02-02 17:58:48 +01:00
defnax
bc8aac1ca6 Added warn messagebox before send invite 2017-02-02 17:15:32 +01:00
csoler
89a27aef8a finished new profile creation window 2017-02-01 23:08:57 +01:00
csoler
2a36d6bad0 re-working on the node creation wizard (unfinished) 2017-02-01 21:55:06 +01:00
csoler
79ef4031f7 tested/fixed all option buttons 2017-01-31 23:07:59 +01:00
csoler
a357c52124 fixed a few things in options 2017-01-31 21:51:16 +01:00
csoler
66bbf4d61c converted the last CONFIG pages to interactive mode 2017-01-30 21:38:06 +01:00
csoler
60d9ea006f changed more ConfigPages to not requiring calls to save() 2017-01-29 21:47:13 +01:00
defnax
7861b092c3 Fixed to display Avatars and nickname on news feeds Messages Item for Distant Messages. 
Added for Invite Message RS_MSG_USER_REQUEST flag & auto send invites to outbox.
Optimized Messages Item for Invite Messages, display a Send Invite Button, to send back own rs cert link via Distant Message.
 2017-01-29 19:01:38 +01:00
csoler
bd379e6b89 changed a few pages to not requiring to call save() 2017-01-28 18:13:38 +01:00
csoler
53a1993842 added missing files 2017-01-26 22:46:58 +01:00
csoler
339572740b keep quit button into toolbar 2017-01-26 22:42:24 +01:00
csoler
67af166c0c moved Options window into a new Preferences tab 2017-01-26 22:35:33 +01:00
csoler
883c4cc8a0 improved AboutWidget a little bit 2017-01-26 09:19:18 +01:00
csoler
1cd64ce0fd improved EE 2017-01-25 22:41:23 +01:00
csoler
0774f08933 fixed display of about widget 2017-01-25 20:27:53 +01:00
csoler
1cdb970e23 moved the AboutDialog into Options 2017-01-24 22:39:28 +01:00
defnax
f90ebb1dfc update Person details window used on Statistics. 
clean up look and feel of Friend Details to get more user friendly for normal users.
 2017-01-24 16:17:53 +01:00
csoler
ca5fa7afa8 Merge pull request #653 from RetroPooh/master 
chatlobby option to disable sending typing notifications; friend connect wizard minor tweaks
 2017-01-23 21:11:22 +01:00
csoler
1d5c536421 Merge pull request #650 from PhenomRetroShare/Add_StatusBarHideOption 
Add StatusBar and its widgets hide options.
 2017-01-23 21:04:41 +01:00
csoler
f7a1348370 made Accepted option in Transfers to send tunnel requests for both encrypted and clear tunnels 2017-01-23 19:13:50 +01:00
RetroPooh
8cf5abcb9d options-network default tab opened changed to first 2017-01-23 21:10:06 +03:00
Phenom
9937513dfd Add StatusBar and its widgets show options. 
The StatusBar is shown by default.
 2017-01-23 18:46:55 +01:00
RetroPooh
091ea055fe fix previous - forgot .h file 2017-01-23 19:58:31 +03:00
RetroPooh
5dc5496767 add friend dialog - hide email and trust strings if not in advanced mode 2017-01-23 18:31:00 +03:00
RetroPooh
bcb1f19990 friend add wizard - hide options checkboxes in collapsible panel, default on in advanced mode 2017-01-23 15:09:40 +03:00
RetroPooh
e82b4fe3c3 friend connect wizard - add tooltips for checkboxes; hide 40peers warning if you have <30 friends; restored back own cert actions for advanced mode 2017-01-23 00:34:02 +03:00
RetroPooh
58c296c69d hide typing notification setting in chat options by default 2017-01-23 00:25:17 +03:00
RetroPooh
9268fd5ff0 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-23 00:21:23 +03:00
csoler
7da68ff72d improved certificate parsing in Home so that corrupted certs never get accepted 2017-01-22 21:44:26 +01:00
csoler
214fbc7957 added a friend recommendation menu entry in Home drop menu, and created the dialog to create/send the recommendations 2017-01-22 21:06:11 +01:00
csoler
dc43611dd4 changed Lobbies into Chat rooms in a few places 2017-01-22 18:52:30 +01:00
csoler
baa9713384 partially changed lobby->chat room in displayed strings in the GUI 2017-01-21 21:38:10 +01:00
csoler
3538b0a455 merged upstream/pr/648 2017-01-21 20:56:00 +01:00
Phenom
aa05d60894 Fix all warnings in UnitTest 2017-01-21 16:31:45 +01:00
felisucoibi
e95c1319b5 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-21 00:08:23 +01:00
csoler
7bbb993769 disabled emoticons from messages and toasters, since they significantly slow down the whole software 2017-01-20 23:00:05 +01:00
RetroPooh
0ca477d01b add chatlobby option to disable sending typing notifications 2017-01-20 22:26:50 +03:00
felisucoibi
39aaca9b87 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-19 14:45:08 +01:00
csoler
f3b3d2b262 disabled emoticon replacement in GxsChannelPostItem and chat lobby toaster and chat toaster, where there are not needed as compare to how problematic they can be 2017-01-19 14:01:54 +01:00
felisucoibi
73f59c2a42 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-19 13:58:36 +01:00
csoler
cb61d58b12 disabled emoticon replacement in channel title because it causes channels to load extremely slowly due to the enormous amount of emoticons 2017-01-19 13:49:17 +01:00
felisucoibi
5f7327f87e Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-18 21:45:56 +01:00
csoler
d2dc632176 Merge pull request #651 from csoler/v0.6-QtOptim 
added a checkbox to load emoticons in forums as an option, so as to a…
 2017-01-18 21:27:27 +01:00
csoler
34962c343a added a checkbox to load emoticons in forums as an option, so as to avoid crazy loading times. Disabled by default until we fix the RsHtml code 2017-01-18 21:22:38 +01:00