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
2,298 Commits 63 Branches 22 Tags 195 MiB
78644a2441
Commit Graph

2298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
78644a2441 - Removed some potentially harmful (deadlock) code. 
- Put some printf into debugging #ifdef



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-25 19:26:37 +00:00
joss17
a6b5e8c364 remove debug outputs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-25 17:07:18 +00:00
joss17
fa53e8b55c fix a gui bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-25 17:07:04 +00:00
joss17
293efbf702 Set the trust lvl to 3 when accepting a friend and the trust lvl is unknown. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-25 17:06:48 +00:00
defnax
f2644d5a06 update Changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-25 10:20:04 +00:00
csoler
0773e92f85 Ported patch from thunder2 (http://sourceforge.net/tracker/index.php?func=detail&aid=2991827&group_id=178712&atid=886241) 
- Bug fix: Checkbox for automatic share of the incoming directory doesn't correctly set with setDown, use setChecked
- ShareManager and RSettingsWin doesn't need to be created all the time
- RSettingsWin: Save the last active page for the current runtime
- ShareManager and DirectoryPage: Show changed shared directories direct after the change




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-24 22:09:47 +00:00
chrisparker126
900ae2332f documented p3chatservice.h 
come on guys!
http://retroshare.sourceforge.net/wiki/index.php/API_Documentation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-24 11:27:25 +00:00
chrisparker126
101e0d9dc6 custom status now sent without needing to have a private chat 
- getcustom status now generate a requests to that peer.
- setowncustom status now generates an 'status available' item sent to all peers

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-24 10:33:12 +00:00
chrisparker126
c5208b29f1 added new const ids for custom status 'request' and 'available' 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-24 10:30:36 +00:00
joss17
c3b4b576ad ad missing code for dyndns details 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-23 18:50:32 +00:00
csoler
d027af3324 corrected handling of null strings in RsTlvBase::GetTlvString() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-23 13:42:01 +00:00
csoler
0d533d14b1 suppressed uninitialized memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-23 13:13:36 +00:00
csoler
695226301a added security check against malformed packets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-23 12:57:59 +00:00
csoler
c4de9f0219 added a security check to avoid core dump when a bad p3discReply packet is received 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 21:32:54 +00:00
defnax
890622f413 fixed #include <netdb.h> is not available on windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 20:03:47 +00:00
joss17
b2b32be32a Udp connection uses now dynsns when available 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 18:50:39 +00:00
joss17
770ea5eada Small rand() fix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 18:50:25 +00:00
joss17
a1ece0b837 Remove some error detection in deserial for dynDNS backward compatibility 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 18:50:10 +00:00
joss17
d70e7a3b71 Add the setDynDNS to the confcertdialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 18:49:51 +00:00
joss17
50e2e5f672 add include for compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 18:49:27 +00:00
joss17
948e4fb61d Commmit the code from Thunder 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 18:49:08 +00:00
defnax
c79d55a7a7 fixed MessengerWindow TreeWidget stylesheet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 14:55:25 +00:00
chrisparker126
c3f8af66e5 forgot to add back qtimer after experimenting with deriving rsAutoupdatepage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-22 13:16:40 +00:00
defnax
fbd46c062e disabled version_detail_bash_script from project file, this makes lots of trouble for new Developers or which want compile first time RetroShare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-21 11:45:22 +00:00
defnax
df0ed3ced6 disabled version_detail_bash_script from project file, this makes lots of trouble for new Developers or which want compile first time RetroShare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-21 11:44:12 +00:00
csoler
2dd10e5151 included patch for openssl-1.0.0 compatibility 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-21 08:52:04 +00:00
defnax
3577fb9acf fixed to get work rsStatus under Windows moved out from if def. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 17:10:45 +00:00
defnax
aefd492b86 Use fixed header size for Avatar Item and display autoconnect attempt after location. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 16:37:53 +00:00
defnax
7e4eaa4ae3 changed default avatar icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 14:50:45 +00:00
defnax
26a5d6d11a display Avatar icons on second item in MessengerWindow, when no Avatar pictures is available show a default one. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 14:34:44 +00:00
csoler
a5fc5e88e8 corrected other mismatched free/delete in avatar items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 14:30:53 +00:00
csoler
abeb4c92ee corrected mismatched free/delete in avatar items. Might have caused random crashes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 14:15:30 +00:00
csoler
7c6ad47bcf forgot to commit this one! Sorry. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 12:08:25 +00:00
chrisparker126
f2a3486e4b fixed compile time error 
- call back function did not pass prev_was_bad as parameter
to gui/qtnotify function which requests password

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 11:51:18 +00:00
chrisparker126
080e10e89d connection for messenger chat to peer dialog (fixes minor bug 
where calling messenger window chat leads to two chat windows opening)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 08:44:51 +00:00
chrisparker126
ab477885c3 restored open messenger to main window left hand panel 
replaced messenger peer icons with avatars




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-20 08:42:45 +00:00
csoler
38463c905e ported branch commit 2732: fixed deadlock in passwd callback 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-19 21:50:03 +00:00
joss17
768b9288b5 Fix a bug when adding a cert 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-19 11:58:34 +00:00
chrisparker126
a5bc5d7aa2 removed offline status msg 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-18 20:01:31 +00:00
chrisparker126
9fb3770066 -sendstatus is now on qtimer - think of replacing with rs notify call back 
- hack to load file status from previous rs session
- also removed 'offline' status

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-18 19:59:41 +00:00
chrisparker126
e6848bb615 enabled messenger on the side of rs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-18 19:54:19 +00:00
defnax
3083ed9db9 update translations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-18 11:29:45 +00:00
defnax
4883f59b17 added icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 22:31:04 +00:00
defnax
4c3651d597 Added to count new messages on Tray icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 14:35:27 +00:00
chrisparker126
76a4c34440 rsstatus 
-implemented simple rsStatus for messenger window
- fixed minor bug with messenger window (starts new pop-up chat dialog when peer responds, if private chat started from messenger window) solution: messenger windows start peers dialogs pop-up chat dialog instead


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 12:02:23 +00:00
chrisparker126
7aa487e2b6 documenting: pqi_base.h 
- could be improved, if anyone knows more on  core rs networking (below p3services and cachestrapper)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 11:39:54 +00:00
chrisparker126
e2c8053eee documentation - p3configmgr.h 
added rstatus config constant id

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2719 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 11:26:44 +00:00
chrisparker126
261637ad08 documentation: pqibin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 10:54:54 +00:00
chrisparker126
a07df15d4d documentation: pqibin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 10:53:00 +00:00
chrisparker126
7009fa36f1 removed old p3status.h/cc service, replaced with p3statusservice.h/cc 
- did not follow naming convention for services

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2716 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 10:50:41 +00:00