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
2,278 Commits 63 Branches 22 Tags 194 MiB
948e4fb61d
Commit Graph

2278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
chrisparker126
300952d2a6 finished status service 
- can be called use rs interface rstatus
- does not save last rs session status yet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2715 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 10:47:48 +00:00
joss17
2eb3d560e0 add commentary for openssl 1.0 compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-15 09:32:59 +00:00
chrisparker126
26db9fde3c more documentation: authgpg 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-14 22:25:13 +00:00
defnax
a02289a611 update translations to the latest 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-14 12:58:59 +00:00
chrisparker126
96ee57e59b deleting diff.c, earlier mistake, should not be here 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-13 13:20:25 +00:00
defnax
76cb8733af Fixed new message string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-12 22:31:14 +00:00
defnax
83272d7900 show rs version on WindowTitle for About Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-11 15:10:47 +00:00
defnax
21cf74c320 update version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-11 14:55:50 +00:00
chrisparker126
9ed53ad5b5 documentation begins in ernest 
-see: http://retroshare.sourceforge.net/wiki/index.php/API_Documentation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-11 08:51:30 +00:00
chrisparker126
aef367ebff added commandline option '-U' to allow user to access different profile 
- in the situation where autologin is enabled 
- BUG found (or rather autologin induced it), if one asks to make friends to a peer (in ConfCertDialg) 'within' a session that uses autologin it freezes 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-10 22:06:11 +00:00
csoler
c6c8e63e91 ported branch commits 2666-2668, 2670-2672, 2679, 2682-2683 into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-10 14:56:34 +00:00
defnax
063a366d12 removed double definition 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-10 10:58:55 +00:00
joss17
9f8a032d93 block the notify callback of authgpg when the main windows is launched 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 19:08:41 +00:00
joss17
ffdd38ddd5 add the internal counter mutex lock. Move the code of the rw mutec to the rsthreads.cc file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 19:08:20 +00:00
joss17
5974ac004e fix a code bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 19:07:58 +00:00
joss17
0f5214ff76 ad a read / write lock and refactor authgpg with it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 19:07:40 +00:00
joss17
a2a567851e Add own key to p3disc clients 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 19:07:16 +00:00
defnax
92df7037b2 Added ShareDialog for ShareManager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 16:33:10 +00:00
chrisparker126
c30e0c071e added gpg initialization for autologin 
- your friends are not authenticated if not

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 15:51:10 +00:00
chrisparker126
1485ccbe87 tested autologin on windows, seems fine 
-removed #ifdef , seems

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 13:24:08 +00:00