Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 19:04:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,180 Commits 63 Branches 22 Tags 195 MiB
0316c8c5ae
Commit Graph

4724 Commits

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
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
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
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