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
11,420 Commits 63 Branches 22 Tags 194 MiB
65977c0be1
Commit Graph

5797 Commits

Author SHA1 Message Date
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
RetroPooh
06e4c68065 upd 2017-03-10 11:15:39 +03:00
RetroPooh
6a2181ca14 transfers - add peer names for turtle routed sources 2017-03-10 09:27:46 +03: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
felisucoibi
717b455699 Merge pull request #13 from felisucoibi/0.6-buttons 
0.6 buttons renamed chat lobbies to chat rooms
 2017-01-18 10:55:01 +01:00
felisucoibi
47a4ed55fd Update ChatLobbyWidget.ui 2017-01-18 10:34:34 +01:00
felisucoibi
837bb76d33 Update CreateLobbyDialog.cpp 2017-01-18 10:31:50 +01:00
felisucoibi
2d764f4755 updated sectionnames chat lobbi 2017-01-18 10:26:25 +01:00
felisucoibi
1217a85d99 change chat lobies t chat rooms strings 2017-01-18 10:15:07 +01:00
felisucoibi
07dd196e6d changed friends to second flaces csoler agreed 2017-01-18 09:54:32 +01:00
felisucoibi
564618764b Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-18 00:48:00 +01:00
felisucoibi
dc391c53fb Update ChatLobbyWidget.h 2017-01-17 17:00:41 +01:00
felisucoibi
ce53a9d392 Update FriendsDialog.h 2017-01-17 16:55:14 +01:00
felisucoibi
296903a00d Update MainWindow.cpp 2017-01-17 16:51:16 +01:00
felisucoibi
66ab7c9eab Update ChatLobbyUserNotify.cpp 2017-01-17 16:49:36 +01:00
felisucoibi
982c8377f8 Update PostedDialog.h 2017-01-17 16:37:23 +01:00
felisucoibi
d31cb0d67d Update NewsFeed.h 2017-01-17 16:36:24 +01:00
felisucoibi
701868d88c Update MessagesDialog.h 2017-01-17 16:35:20 +01:00
felisucoibi
0633744aa8 buttons 2017-01-17 16:34:37 +01:00
felisucoibi
02aec3d9ef button changes 2017-01-17 16:32:56 +01:00
RetroPooh
f079e99642 fix mute option in chatlobby id menu 2017-01-17 17:21:51 +03:00
csoler
d5936a56e7 removed debug msg 2017-01-16 20:49:52 +01:00
csoler
e7a119f22c added a warning and skip files with missing hash in copy link 2017-01-15 21:13:27 +01:00
csoler
f314e7d330 simplified code in PR/630 2017-01-15 20:56:44 +01:00
RetroPooh
75d717c2df fix 2017-01-15 20:29:59 +03:00
RetroPooh
ed4de4ecda Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-15 11:48:35 +03:00
csoler
dd408773c7 removed debug info 2017-01-14 19:08:14 +01:00
csoler
318a3720c6 fixed reloading of distribution icons when opinion is changed over an ID in forums. Improved efficiency of forum loading in general. 2017-01-14 19:04:14 +01:00
csoler
25680d586c removed quadratic cost in forum thread fill 2017-01-14 17:29:37 +01:00
csoler
730869591d fixed reloading of GXS id icon when banned/unbanned in forums 2017-01-14 11:02:02 +01:00
csoler
57f22e9764 removed costly size() call in QList 2017-01-14 10:51:14 +01:00
csoler
df94de9142 disallow to ban your own identity in forums, and make opinions show up as a function ofwhat the ID opinion already is 2017-01-13 18:31:50 +01:00
csoler
17cf6607f8 improved settings->People text fields and tooltip 2017-01-13 16:35:42 +01:00
RetroPooh
cef62e30fc fix 2017-01-13 18:20:19 +03:00
csoler
3c800c45c6 fixed enabled 0 in settings->People fields 2017-01-12 22:54:38 +01:00
csoler
d7e068220d fixed sorting by reputation in IdDialog 2017-01-12 21:59:44 +01:00
csoler
70a92a1c32 various small fixes in reputation/identity cleaning 2017-01-12 21:14:36 +01:00
csoler
bd7f6aca99 added to parameters in options to fix the time banned ids are kept in list and prevented to re-download 2017-01-12 20:39:49 +01:00
RetroPooh
8ae9eff928 chatlobby id context menu - fix reputation change actions 2017-01-12 16:26:35 +03:00
RetroPooh
10ba3a6364 chatlobby id context menu - fix display conditions 2017-01-12 16:26:06 +03:00
RetroPooh
36dbdee409 show in people - enabled for yourself; Votes in tooltip; lastpost 1970 to Never 2017-01-11 22:44:27 +03:00
csoler
a810ae9a74 use rsReputations instead of rsIdentity for reputation calls. Suspended reputation vetting code which is not needed anymore 2017-01-10 21:44:37 +01:00
unknown
a954b19d8e groups tree tooltips and info panels - add last post date info 2017-01-10 01:18:35 +03:00
unknown
8365ac2647 Revert "groups tree tooltips and info panels - add last post date info" 
This reverts commit 2bb7c8d010.
 2017-01-10 00:46:29 +03:00
unknown
2bb7c8d010 groups tree tooltips and info panels - add last post date info 2017-01-10 00:31:32 +03:00
unknown
c2214c8cfa chatlobby id menu - add open people tab for id 2017-01-09 18:22:47 +03:00
unknown
cc3b8bde52 lobby id dialog - add vote neutral option 2017-01-09 16:05:23 +03:00
unknown
bc43cb8cf0 small gui tweaks 2017-01-07 23:29:24 +03:00
csoler
a210c13d12 fixed clicking of RS links in identity usage statistics 2017-01-04 21:49:52 +01:00
csoler
f72399f2a8 merged upstream/master 2017-01-04 20:24:08 +01:00
csoler
98524e861c added translations and human readable messages for ID activity statistics 2017-01-04 20:21:49 +01:00
csoler
2919058652 finished backend part for identity usage statistics 2017-01-03 23:31:29 +01:00
defnax
5469eb168d Added display labels to show positive and negative votes 2017-01-03 16:43:31 +01:00
defnax
0ba28a206d Removed Column text for Votes, Distribution replaced by icon. 
Set column header to "ResizeToContents" to not use much space
Added new Bio hazard icons to look same like other ones
 2017-01-03 01:37:16 +01:00
csoler
a6ec626c3d fixed wrong icon in GxsIdChooser 2017-01-01 18:07:02 +01:00
Phenom
41386c64b7 Fix some new warnings 2016-12-31 15:17:51 +01:00
csoler
fb733916ef added two fields in settings/people to setup the thresholds to decide between neutral and remotely positive/negative reputation 2016-12-28 18:58:49 +01:00
csoler
da881e1f5b fixed setting of author reputation from forum thread menu 2016-12-27 21:13:37 +01:00
csoler
3a92124aac added method to show a given post author into the people tab 2016-12-27 20:42:47 +01:00
csoler
64737827a1 added an icon for when information is missing for an ID in forum distribution 2016-12-27 17:17:23 +01:00
csoler
5ed879c035 added small debug output in GxsForumThreadWidget 2016-12-26 17:00:21 +01:00
csoler
d8233bb101 merged updatream/master 2016-12-26 16:59:52 +01:00
csoler
742a7648a4 added display of warning for non forwarded posts 2016-12-26 15:59:53 +01:00
csoler
811d084dfa only show distribution column if anti-spam is enabled 2016-12-25 23:43:29 +01:00
csoler
b34ab447da added menu entries to vote for/against a forum poster 2016-12-24 17:29:53 +01:00
csoler
d423745064 added column to show distribution data and moved ReputationItemDelegate to GxsIdDetails 2016-12-24 15:04:08 +01:00
defnax
c100775932 Changed Share icon on Home View 2016-12-24 14:40:56 +01:00
csoler
873c0e60df added display of reputation in forums 2016-12-24 14:13:02 +01:00
csoler
e5e59098ac added proper display of reputation as an icon in IDDialog 2016-12-23 22:53:57 +01:00
csoler
72fb8f17a9 changed the reputation system to output a level that differentiate your own opinion to your friends opinion 2016-12-23 17:52:02 +01:00
defnax
864776119f Changed Paste icon 2016-12-22 17:10:51 +01:00
csoler
8b9038a028 improved display/wording of usage statstics in People 2016-12-22 11:21:49 +01:00
Phenom
40cf76808c Fix compilation and some new warnings. 2016-12-21 21:23:54 +01:00
defnax
aca36a3e37 Improving the Certificate Page for Connect Wizard: 
Added place holder text for Cert Field
renamed some strings
Improved layout for easy paste key and display the errors.
 2016-12-21 19:07:57 +01:00
csoler
d3051eff1a added display of usage statistics for GXS identities 2016-12-21 00:34:07 +01:00
csoler
8de9ee8b8d made friendly time unit returns empty string when time is 0. Fixes 46y display in search dialog 2016-12-19 23:29:04 +01:00
defnax
c9511c42b7 update emotes strings 2016-12-19 20:52:24 +01:00
Gio
3662a36092 Coherent behaviour of general config with auto-login compile option 2016-12-15 11:20:13 +01:00
csoler
81dffbed84 Merge pull request #591 from G10h4ck/split_autologin 
Made autologin optional at compile time
 2016-12-14 16:45:45 +01:00
defnax
96b6cd3d34 Added "Add friends Certificate" Button for Home View, for call easy the Text Page for Paste friends Cert faster. 2016-12-14 15:20:03 +01:00
csoler
12023397ee Merge pull request #592 from csoler/v0.6-GXS-LimitedSync2 
V0.6 gxs limited sync2
 2016-12-14 00:09:54 +01:00
csoler
cbc82870e6 used item disable to show current choice in sync/store menu since some systems dont show the menu icons 2016-12-13 22:46:30 +01:00
csoler
fca8d6fc4e added display of storage/sync in forum summary 2016-12-13 21:52:11 +01:00
csoler
5953e563f4 added auto-consistency between store/sync periods 2016-12-13 21:12:34 +01:00
defnax
2e717d35c7 Added Home Page View for easy see own Cert to Copy and Share to Friends 
Fixed Share Manager Label layout
Update emotes file
Set radio items font size to stylesheet file
 2016-12-12 21:16:56 +01:00
csoler
4933cce278 Merge pull request #595 from PhenomRetroShare/Add_UnreadColumnToGroupTreeWidget 
Add Unread column to GroupTreeWidget
 2016-12-10 22:58:23 +01:00
Phenom
803d1b62ef Fix RSElidedItemDelegate text color. 2016-12-10 19:52:46 +01:00
Phenom
8f452eefb1 Add Unread column to GroupTreeWidget 2016-12-10 17:59:58 +01:00
csoler
661038d9b2 added a function to check keep/req times for consistency 2016-12-05 23:42:44 +01:00
csoler
7afb91d1db added machinery to allow to set/get sync and store periods for GXS groups 2016-12-05 22:14:48 +01:00
csoler
d2ef2248c6 added entry in rsgxsnetservice to change sync params 2016-12-04 23:42:26 +01:00
Gio
8656452c68 Made autologin optional at compile time 
Autologin is disabled by default at compile time, and a warning to
discourage it's usage is printed if it is enabled.
This will make default RetroShare build safer and reduce dependencies as
example we don't depends anymore on gnome keyring is not needed in default
build for linux anymore.
 2016-12-03 20:04:25 +01:00
csoler
eedeaebbe7 used light grey instead of read to show missing directories 2016-12-03 15:13:04 +01:00
csoler
8adb91be91 removed compilation of ShareDialog that is unused, and cleanup the editing in ShareManager 2016-12-03 15:05:10 +01:00
defnax
6890669820 update emotes file 2016-12-02 23:00:57 +01:00
csoler
a005fa08cc display missing directories in red in share manager 2016-12-02 19:36:34 +01:00
Phenom
674b6de381 Fix Some gcc warnings 383 to 208 lines 
Left explicit #warning and deprecated.
Some lines are wrong indented and produce mal formed code.
 2016-11-30 22:01:01 +01:00
defnax
d616df3b28 Merge pull request #586 from hunbernd/fix/external-emoticons 
Fixed loading of external emoticons
 2016-11-30 08:12:38 +01:00
hunbernd
5fd1de0011 Fixed loading of external emoticons 
- path comparison was Linux specific, also it had problems with relative paths
- name.scheme() returns empty string in this case, check if the url really points to a file instead
 2016-11-28 00:35:09 +01:00
csoler
6937d870b0 changed from std::string to RsPgpId to represent openned items in FriendList 2016-11-27 20:57:51 +01:00
defnax
8b22924b25 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-11-27 18:00:26 +01:00
defnax
cfd4afdc07 Update emoticons file 2016-11-27 17:59:15 +01:00
defnax
521663698f Merge pull request #585 from PhenomRetroShare/Add_RSELidedItemDelegate 
Add RSElidedItemDelegate.
 2016-11-27 16:42:45 +01:00
defnax
486c11377f Changed smiley widget default width 
Update Emotes file
 2016-11-27 15:58:53 +01:00
defnax
0f6392128b Fixing icon size for smiley widget. 2016-11-27 00:11:21 +01:00
csoler
2a758dd880 changed shared files tree header when updating 2016-11-26 19:19:15 +01:00
csoler
d01644c854 added back the test for local/remote in SharedFilesDialog as it reduces the load anyway 2016-11-26 11:26:02 +01:00
csoler
4ef1b08ee8 attempt to fix emoticons sizes on high DPI screens 2016-11-26 11:22:35 +01:00
csoler
3386238f35 improved preservation of directories when updating, and allow to temporarily disable sorting while an update is received 2016-11-26 11:03:53 +01:00
defnax
7aaf3306f0 Added category icons for Smiley Groups 
Updated emotes file, sorted Emoticons.
 2016-11-26 00:02:58 +01:00
Phenom
d4c3372dec Add RSElidedItemDelegate. 
This works like ElidedLabel.
 2016-11-25 22:14:17 +01:00
mr-alice
5f69c9ea1f added an option to follow symbolic links or not, and anti-loop system during directories traversal 2016-11-24 23:42:56 +01:00
Phenom
ae8365167e Add grouped emoticons. 2016-11-23 18:48:16 +01:00
sehraf
2ffe3e387f fix emoticons: make ':)' actually look like ':)' instead of ':D' 2016-11-21 15:00:33 +01:00
csoler
da84b887a9 fixed constant updating of flat dir model. Had to limit to at most 10000 files to keep it interactive. 2016-11-20 20:42:14 +01:00
Phenom
007825b1fa Fix Anchor on Channel Message 2016-11-19 16:44:12 +01:00
csoler
deadb1fcf1 small optimization of RemoteDirModel::data() 2016-11-17 21:01:01 +01:00
felisucoibi
999ab0b98a fix sorting crashing with qt5 in shared files of friends rev3 2016-11-16 12:07:38 +01:00
felisucoibi
ee23c42db8 fix sorting crashing with qt5 in shared files of friends rev2 2016-11-16 12:05:05 +01:00
felisucoibi
1757a7b7e1 fix sorting crashing with qt5 in shared files of friends 2016-11-16 12:02:54 +01:00
felisucoibi
628177c302 fix for windows compile 2016-11-16 11:22:23 +01:00
felisucoibi
ddff9f5358 Improved total file size and a small bug with a comma in TB string of file size 2 CLEANED CODE 2016-11-16 11:03:02 +01:00
csoler
8c8cc88503 fixed problems with negative time shifts in DirDetails causing multiple GUI bugs in File Lists and Search 2016-11-14 21:58:58 +01:00
csoler
c07dd83ba9 merged upstream/master 2016-11-12 15:53:17 +01:00
csoler
5ef4e752d9 added count of total number of files and total file isze on top of shared directories 2016-11-11 20:25:11 +01:00
Phenom
2827233880 Fix windows Compil with sys/socket.h 2016-11-08 23:04:34 +01:00
csoler
61131e4bf5 simplified the remoteDirModel cache system a little bie 2016-11-08 19:56:07 +01:00
csoler
644c41e2e7 added a small trick to cache last request of RemoteDirModel::requestDirDetails 2016-11-07 22:24:02 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
csoler
390bdfe12f added request for sync on double click item for shared file lists 2016-11-05 17:03:31 +01:00
mr-alice
2bb9a87b3b merged and fixed conflict with upstream/master 2016-11-04 13:52:11 +01:00
mr-alice
8653649132 fixed two bugs in ShareManager popup menu 2016-11-03 20:26:35 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
mr-alice
5aef67d332 fixed tooltips in ShareManager, and fixed anonymous search mechanism 2016-11-02 21:31:14 +01:00
Cyril Soler
46dd5be2f2 Merge pull request #554 from hunbernd/feature/paste-RS-link 
Automatically detect retroshare links when pasting text
 2016-11-01 16:30:46 +01:00
mr-alice
02f442a400 changed naming for files visibility 2016-11-01 14:28:00 +01:00
mr-alice
8c7c7647b0 fixed conflicts in merging upstream/master to v0.6-FTEncryption 2016-11-01 14:23:13 +01:00
mr-alice
c6df59a421 fixed bug in duplication of virtual dir names 2016-11-01 11:11:28 +01:00
mr-alice
761d595cb7 fixed layout and names in ShareManager and SharedFilesDialog 2016-11-01 10:46:29 +01:00
mr-alice
3430eece22 fixed display of share flags as a proper nice icon set 2016-11-01 10:30:36 +01:00
mr-alice
8fe85b9bdd improved ShareManager a little bit more 2016-10-31 23:24:35 +01:00
mr-alice
9d586bcfb0 made a drastic simplification pass on the ShareManager, which now only needs a single window except for selecting files using a QFileDialog 2016-10-31 16:28:26 +01:00
mr-alice
e8e054eeae addednew flag for anonymous search. Merged the two browsable flags in one single flag. 2016-10-31 14:26:01 +01:00
hunbernd
36dc532da6 Automatically detect retroshare links when pasting text 2016-10-31 01:07:50 +01:00
hunbernd
05b5c08e9f Fixed emoticon order 2016-10-30 19:42:28 +01:00
mr-alice
5b9ef04358 improved debug output in ftserver 2016-10-30 15:33:05 +01:00
mr-alice
34dcb410b4 fixed a few bugs in ftServer for encrypted tunnel management 2016-10-30 11:36:00 +01:00
mr-alice
babc126be3 added default encryption policy variable and GUI to change it 2016-10-29 17:59:03 +02:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Phenom
32e54e53b7 Fix PR#536 revealing of bad factor management in StyledElidedLabel. 2016-10-25 18:39:22 +02:00
Phenom
fd5a5cc804 Fix PR#540 2016-10-24 20:11:47 +02:00
Cyril Soler
f3bebc030b Merge pull request #540 from PhenomRetroShare/Fix_EmbedInHtmlAhref 
Fix handle of url in EmbedInHtmlAhref.
 2016-10-23 23:29:06 +02:00
Cyril Soler
c77d0521d0 Merge pull request #536 from PhenomRetroShare/Add_ElidedLabelToGroupTreeWidget 
Add ElidedLabel to GroupTreeWidget
 2016-10-23 23:25:53 +02:00
Cyril Soler
04992c9c29 Merge pull request #543 from PhenomRetroShare/Add_TooltipOnComments 
Add Tooltip on comments column to see too long text.
 2016-10-23 23:15:32 +02:00
Cyril Soler
e5254617cc Merge pull request #542 from PhenomRetroShare/Add_PasteRsLinkInTextFields 
Add ability to past RsLink in some more text fields.
 2016-10-23 23:14:29 +02:00
Phenom
46cf25d3aa Fix Copy RsLink in Clipboard. 
Spaces and specials characters are now encoded.
 2016-10-22 17:22:22 +02:00
Phenom
a67cf92192 Add Tooltip on comments column to see too long text. 2016-10-22 16:15:36 +02:00
Phenom
9eafdd30f7 Add ability to past RsLink in some more text fields. 2016-10-22 16:03:01 +02:00
Phenom
58a4d39b0f Fix handle of url in EmbedInHtmlAhref. 
The url cannot contains space. Query and hash are now handled.
 2016-10-22 14:48:47 +02:00
hopetech
ecaea051fa Fix some compilation warnings 2016-10-19 15:41:25 +02:00
Phenom
8483c0d0ca Add ElidedLabel to GroupTreeWidget 2016-10-16 19:00:33 +02:00
Phenom
4db6d6b56f Fix the "Desktop file is missing" shown in option page. 2016-10-13 13:26:44 +02:00
Gio
633a6cf8c2 Fixed a bunch of warnings in safe ways 2016-10-13 00:01:33 +02:00
Cyril Soler
32816eda71 Merge pull request #531 from PhenomRetroShare/Fix_AvatarOnEditCircle 
Fix Missing ID-Avatars in Create Circle Menu
 2016-10-09 18:23:25 +02:00
Phenom
3d9fb600f0 Fix Missing ID-Avatars in Create Circle Menu 
Fix issue#530
 2016-10-09 12:37:09 +02:00
cave beat
3813845343 patch from sss rus translation 2016-10-08 16:06:42 +02:00
Cyril Soler
97f2589a1f Merge pull request #513 from grennvyper/patch-1 
Update retroshare_de.ts
 2016-10-08 14:09:34 +02:00
Cyril Soler
259181889f Merge pull request #515 from PhenomRetroShare/Add_ContextMenuToShowImageInLobby 
Add context menu to show hidden image on lobby.
 2016-10-08 14:04:31 +02:00