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
3,964 Commits 63 Branches 22 Tags 194 MiB
ded1707151
Commit Graph

3964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
97ed1d534f - removed calls to rsfiles->get{Download,Partials}Directory() in RsDiscSpace class, since it would trigger a call to ftController 
- added a lock into ftTransferModule::recvFileData() (Crash reported by Costa due to storing data in a deleted transfer module)
- changed names of functions in ftTransferModules to locked_* when appropriate (helps debugging)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-23 21:08:11 +00:00
csoler
3ed0c1d885 added patch from AsamK to show the availability status of peers at the level of locations instead of GPG keys 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-23 17:06:07 +00:00
csoler
dd474cfddf added chunk splitting in case part of the file transfer data does not come. Added strategy to ask again for missing data. The combination of these two cannot result into an infinite loop (as before) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4610 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-22 19:58:47 +00:00
csoler
ad04f62e80 added past RS links to post on channels, and additional check that the file is already shared 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-18 19:43:38 +00:00
csoler
b9dfa27c19 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-16 19:15:36 +00:00
csoler
9b5928453d stopping hash when the top directory is removed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4607 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-15 21:22:34 +00:00
csoler
0b33b6fc9d fixed bug fue to deleting ftFileCreator used by datamultiplex before asking datamultiplex to remove it! 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-15 19:33:58 +00:00
thunder2
526f71bebd Fixed crash in "pqiSSLstore::readPkt" when "rsSerialiser->deserialise" returns NULL. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-14 11:05:17 +00:00
thunder2
2fac47293e Reworked the process of the RetroShare links. Now RetroShare asks when adding a file or a person link and shows a detailed result. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-11 22:07:24 +00:00
chrisparker126
d30c03b183 added back changes from revision 4542 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-10 18:42:47 +00:00
chrisparker126
7e8d8aea9c merging distrib split into trunk 
suppressed p3distrib in services 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-10 15:20:15 +00:00
csoler
dc0f4ef68a send msg in plain text when the html encoding does not change anything into the message. This drastically reduces messages size. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4599 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-09 19:54:17 +00:00
csoler
b73fd06753 added auto-split of long private messages, and re-combination of partial messages on client side. Corrects the bug causing disconnection when sendign messages of side larger than the maximum packet size. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-09 19:37:38 +00:00
thunder2
5b3543d41a Added missing status frame for idle. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-09 12:17:24 +00:00
csoler
7373b602e3 apparently this file was missing. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4595 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-08 19:25:17 +00:00
csoler
258aea44f7 apparently this file was missing. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-08 19:22:50 +00:00
thunder2
1821d8cb06 Set own status initially to online. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-08 13:17:49 +00:00
thunder2
a34c482db1 Added double click to NetworkDialog to show the peer details. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-06 20:44:22 +00:00
csoler
c8e2a4c828 put some pqissl warnings in log file only in debug mode, since this is quite CPU demanding 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-06 18:54:55 +00:00
thunder2
62b2de63b7 Added new widget to display an avatar with or without the status frame - AvatarWidget. 
Changed all existing avatars to AvatarWidget.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4589 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-05 21:19:07 +00:00
csoler
0ed60eaf86 merge of QoS branch into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-04 20:01:30 +00:00
csoler
663ce50630 patch from AsamK to fix up crash at startup due to a missing else 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-03 22:16:51 +00:00
csoler
7f610a4849 removed unused image 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-03 08:45:18 +00:00
thunder2
b35d32ef15 Added avatar image to ConfCertDialog (defnax). 
Added new class AvatarDefs to get the avatar for a ssl id or gpg id.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-02 10:22:44 +00:00
csoler
0591ef0432 corrected bad modification of commit #4560, which made RS not compilable on ubuntu karmic 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-01 16:42:05 +00:00
csoler
3bccaf0520 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-01 08:43:18 +00:00
csoler
80269eb824 changed local root directory to be "My files" instead of SSLid 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-31 20:17:24 +00:00
csoler
52a8b281d5 fixed up color codes for qt 4.7 in NetworkGraph (bug in qt::lighter()) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-31 20:04:04 +00:00
csoler
8941aa5991 corrected a few bugs in the cert cleaning method. Added feedback to the GUI and error codes for the cert cleaning function of rspeers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-30 21:49:49 +00:00
chrisparker126
3ff69a1be5 added private groups option to forums 
fix for grp edit in p3distrib

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-29 21:20:48 +00:00
thunder2
35a059c44c Partial fix for ticket #146: 
- set default of the signature checkbox in ConnectFriendWizard to disabled
- set the initial option for the download directory to network wide only
- set the default of a new shared directory to network wide


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-28 22:54:01 +00:00
thunder2
44806b7581 Found another missing toUtf8 in GenCertDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-28 00:21:34 +00:00
thunder2
185307ad37 Fix for ticket #129 
Utf8 chars don't show up for peer names, in private chat and file list.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-27 22:54:05 +00:00
thunder2
4f1d1b8dc7 Fix for ticket #127 
Impossible to download a directory, if the download directory is utf8.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-27 21:04:02 +00:00
thunder2
154d315c92 Fix for ticket #124 
Search don't work with utf8 chars.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4574 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-27 16:15:56 +00:00
thunder2
ac6f4539e9 Fixed the display of the time in the SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-22 09:32:03 +00:00
thunder2
01fa9eec3f Added a new checbox in the settings (NotifyPage) to enable/disable the new SecurityItem. It is enabled by default, but all existing users need to enable it. 
Added new buttons to SecurityItem to add/remove the peer and view peer details.
Added new call to notifyListChange with NOTIFY_LIST_FRIENDS in AuthGPGimpl::AllowConnection.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-21 22:28:19 +00:00
chrisparker126
2e9d5663c9 removed potential mem leak with p3distrib group edit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-20 20:20:55 +00:00
thunder2
d349204a63 Added check for administrator rights to add/remove the retroshare:// protocol. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-17 00:06:44 +00:00
thunder2
0f51b7d72f Set inititial sizes of the splitter and columns in FriendsDialog and SearchDialog. 
Fixed height of the MainWindow when GetStartedDialog is visible.
Fixed the initial size of the ShareManger and show the checkboxes for the share mode centered.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-15 23:42:07 +00:00
thunder2
d25730eabb - Removed not used function RsDirUtil::createBackup. 
- Moved ProfileView and ProfileEdit to the folder unfinished.
- Removed "location:" before the ssl name in FriendsDialog and MessengerWindow.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4567 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-14 22:31:05 +00:00
thunder2
39708cdd0b Removed some more compiler warnings in retroshare-gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-14 21:25:41 +00:00
thunder2
cd0854c4e8 Removed duplicate labels in ui files and some other compiler warnings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4565 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-13 22:26:51 +00:00
csoler
53a7c77ae4 updated scripts for version 0.5.2. Updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-13 18:25:22 +00:00
thunder2
0fbada0eba Applied patch from AsamK and fixed german translation. 
Reduced code duplication with avatar picture loading, by creating two new functions that handle image choosing and thumbnail creation.

two new functions:
bool misc::getOpenAvatarPicture(QWidget *parent, QByteArray &image_data)
QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption, int width, int height)

getOpenThumbnailedPicture opens a QFileDialog to let the user choose a picture file. This picture is converted to a thumbnail and returned as a QPixmap.

getOpenAvatarPicture calls getOpenThumbnailedPicture and converts the result to a PNG byte array.

All three avatar loading functions now call getOpenAvatarPicture
Furthermore Channel Logo and Channel Msg thumbnail functions now use getOpenThumbnailedPicture

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 20:27:05 +00:00
thunder2
43c0594d18 Changed some parameters from "std::string" to "const std::string&" in rsinit.h. 
Log the error messages from gpgme (ProcessPGPmeError) to stderr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 20:02:00 +00:00
thunder2
70d02c718d Removed unused parameter warnings in retroshare-gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 14:06:29 +00:00
thunder2
c6beee44ec Removed unused parameter warnings in libretroshare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 13:42:30 +00:00
thunder2
27842b8592 Removed unused parameter warnings in libbitdht. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-12 12:43:24 +00:00
thunder2
babbea6599 - Moved the setting maxTimeBeforeIdle from the section [%General] to [General] in the profile. Please set your prefered value again. 
- Saved the selected tab in the TransferDialog in the profile.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-08-10 22:47:18 +00:00