Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 11:24:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
916 Commits 63 Branches 22 Tags 195 MiB
0734fb3e72
Commit Graph

916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
drbob
0734fb3e72 Separated Qt4.4 features, so Qt4.3 builds can be done. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-07 19:54:40 +00:00
joss17
46f7dd0047 Some work on the link of the chat dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-07 19:40:02 +00:00
joss17
f2a2681c2e change syntax for fixing compilation bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-07 17:01:45 +00:00
joss17
dfad69de9f add a popup when file link is clicked, and a test if a file link is malformed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1183 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-07 16:07:43 +00:00
defnax
aa0c678d67 enabled translation for "Chatting with " 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-07 13:45:37 +00:00
joss17
8e6f082025 add file button to general message; add extra file sending from chat dialog; Add a link when sending a file; Add a link for downloading in the reciever chat dialog; Little gui improvement 
Merge branch 'extraFile'


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-06 21:15:12 +00:00
joss17
e34173759e timeout on fil index cache transfer \n Set fileIndex cache transfer timeout to 300sec \n Remove the downloads item for file index cache transfer 
Merge branch 'fiIndexCacheTransfertImprove'


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-06 20:48:32 +00:00
joss17
22dea2ceea Revert "Merge branch 'singleFileClient'" 
This reverts commit 1bf9ed770532f3093548fa4120209be3a31c5c21, reversing
changes made to 5b0464d7a0aaa034851dfc80ca0a2d367f4c28ef.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-06 11:39:34 +00:00
defnax
693cb93868 fixed layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1178 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-06 00:41:21 +00:00
defnax
626074d3f8 redesign the Search Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-06 00:31:09 +00:00
csoler
6f59bd806b Corrected setLogInfo core dump state. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 19:50:45 +00:00
csoler
83b1fc5e1f restored updatePeerStatus() method 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1175 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 19:23:21 +00:00
joss17
97259d43ff Merge branch 'addIp2KeyServer' 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1174 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 19:19:36 +00:00
csoler
02c1562622 restored updatePeerStatus() method 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1173 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 19:15:32 +00:00
joss17
416b367c58 Add the network dialog window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 17:22:03 +00:00
defnax
c4ee0ec40e suppressed updatePeerStatusString 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1171 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 16:56:42 +00:00
defnax
a17f70309e suppressed chatDialog problem in PeersDialog.cpp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 16:15:10 +00:00
defnax
74c0df0d7e removed not needed Chatdialog header in MainWindow 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 16:01:43 +00:00
joss17
698425ba9e Merge branch 'badPacketMessage' 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 13:35:36 +00:00
joss17
16231dea2b Merge branch 'singleFileClient' 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 13:32:59 +00:00
joss17
5cd93b772d test 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 13:31:49 +00:00
csoler
70f0253e54 suppressed ChatDialog entries from Retroshare.pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 13:21:36 +00:00
csoler
e144e75ba6 Added "peer is typing" functionality to private chat. This shoudld be extended to additional stuff like "idle", and to public chat. Also the display is the status bar of the chat window could be made nicer, e.g. directly in the msg window. Suppressed ChatDialog class that is not more used 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 13:18:53 +00:00
defnax
ce3db07a63 update translation strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1163 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-05 12:00:13 +00:00
defnax
dbd5b6de39 moved Network Status Tab from Preferences to NetworkDialog as second tab after Log tab. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1162 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-04 00:30:24 +00:00
notdefine
5affea57ae cleanup 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1161 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-03 07:59:24 +00:00
notdefine
d870ae4ef2 It makes no sense if the total Transfer rate is lower than the individual rate. 
Avoid this due setting uper limit for individual rate, and correct old wrong saved settings.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-03 00:41:38 +00:00
defnax
bdd56208ac fixed statusrates it doesnt worked correct 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-02 23:34:25 +00:00
defnax
1c5db15325 grey user icon when online is 0 on statusbar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1158 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-02 22:45:31 +00:00
defnax
69914204db generated for statusRates own class to clean more MainWindow 
clean up some namings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1157 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-02 22:14:20 +00:00
csoler
e3a5372597 added dependency to libqt4-script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-02 13:56:22 +00:00
defnax
130143192f clean up source structure 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-02 00:12:29 +00:00
defnax
72f7fd0be4 update Readme 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-01 22:01:34 +00:00
defnax
3fe5b6dbfd update README.txt 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-01 21:52:59 +00:00
defnax
3e2993536e cleaned up MainWindow 
Added to pro file  DEFINES += RS_RELEASE_VERSION enable it for release versions.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-01 16:17:24 +00:00
defnax
255b5dca39 added the basic natstatus feature for statusbar, 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-01 12:45:27 +00:00
defnax
9113d01977 changend string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1149 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-01 11:31:56 +00:00
defnax
63ea6946c7 Added DHT status to statusbar, it will be change his color and changes the tooltip . 
Added Network Status for Log Tab too in NetworkDialog at the moment realy basic,every 100 seconds checks for the actually status.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1148 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-01 02:39:57 +00:00
defnax
dfabbcca6d set leftside toolbar moveable to all toolbar areas. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-30 19:31:41 +00:00
defnax
de4081002b update icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-29 20:55:48 +00:00
defnax
34c8e5108b update view button 
enabled for some strings translation to use (tr)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-29 17:48:25 +00:00
defnax
88fa2715d5 added view button 
let left toolbar moveable to right side.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-29 17:07:28 +00:00
defnax
1cc8639305 changend network icon 
set different icon color for avaible

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1143 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-29 15:48:01 +00:00
defnax
98835897cc update changelog and rsversion 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-28 21:44:49 +00:00
drbob
28df984148 * Added partially completed authssl.cc, as we move towards openpgp authentication. 
Once completed this will allow standard ssl authentication and provide the base for
the openpgp authenticator,
 * Tweaks, and removed debug statements.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-22 23:29:16 +00:00
drbob
5466c447ae Added missing files (extaddrfinder & p3turtle) to Makefiles. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1139 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-21 19:12:43 +00:00
notdefine
ad56293dff removed fff from the username in chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-20 20:02:32 +00:00
defnax
64fd117316 added missed qm files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-20 14:10:30 +00:00
defnax
e037bb072f update turkish strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1136 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-20 13:38:30 +00:00
defnax
cfbfb9b148 added support for CN and TW languages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-20 13:24:56 +00:00