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,001 Commits 63 Branches 22 Tags 194 MiB
ca5fa7afa8
Commit Graph

10001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
297907ef81 Merge pull request #662 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2017-01-22 21:48:48 +01: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
aa62136f17 Merge pull request #657 from PhenomRetroShare/Add_NoCppWarningFlag 
Add no cpp #warning Config flag to better show other ones.
 2017-01-22 19:47:50 +01:00
csoler
dc43611dd4 changed Lobbies into Chat rooms in a few places 2017-01-22 18:52:30 +01:00
csoler
73d9a48366 update client Grp TS even when friend peer is subscribed to no groups, so as to avoid the friend re-sendign an empty list indefinitly (fix suggested by jo) 2017-01-22 18:36:36 +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
csoler
72493ad09f Merge pull request #658 from PhenomRetroShare/Fix_Compilation 
Fix Compilation
 2017-01-21 17:31:06 +01:00
Phenom
1f5ef4cc05 Fix Compilation 2017-01-21 17:29:07 +01:00
csoler
e07d6ff6b1 removed debuginfo from PR 654 2017-01-21 17:26:44 +01:00
csoler
6f7f1c2e65 Merge pull request #656 from PhenomRetroShare/Fix_UnitTestWarnings 
Fix all warnings in UnitTest
 2017-01-21 17:16:56 +01:00
Phenom
eee2a7b314 Add no cpp #warning Config flag to better show other ones. 
Use CONFIG+=rs_nocppwarning to qmake command line.
 2017-01-21 16:51:49 +01:00
Phenom
aa05d60894 Fix all warnings in UnitTest 2017-01-21 16:31:45 +01:00
csoler
e3240de8e0 Merge pull request #654 from csoler/v0.6-GXS-LimitedSync2 
V0.6 gxs limited sync2
 2017-01-21 15:06:46 +01:00
csoler
9a20160d1e merged upstream/master 2017-01-21 14:01:53 +01:00
felisucoibi
e95c1319b5 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-21 00:08:23 +01:00
csoler
ee4d722225 fixed cache deletion of GXS grp meta that caused deleted groups to not come back when available 2017-01-20 23:27:18 +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
csoler
d1af2e09dc merged with upstream/master 2017-01-20 00:00:47 +01:00
csoler
b52ab0f542 added auto-clean of unused groups when grpAutoSync is enabled (so it does not touch identities) 2017-01-19 23:59:26 +01: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
csoler
410123b976 added warning about consistency error in idservice group flags 2017-01-19 11:16:47 +01:00
csoler
06265f2b54 added consistency check in meta data in publishGroup() and updateGroup() in order to avoid bad data supplied from GXS services 2017-01-19 11:13:06 +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
csoler
bdc5680f88 Merge pull request #647 from RetroPooh/master 
fix mute option in chatlobby id menu
 2017-01-17 23:01:51 +01:00
felisucoibi
e778b8c854 Merge pull request #12 from felisucoibi/0.6-buttons 
Buttons 0.6 v3
 2017-01-17 17:01:37 +01:00