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
4,343 Commits 63 Branches 22 Tags 194 MiB
68c07321ea
Commit Graph

4343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
defnax
68c07321ea Added a label for Connect Attempt after nickname "wants to be friends with you on RetroShare" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 15:30:14 +00:00
defnax
57260853b7 removed not used items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 15:20:06 +00:00
csoler
5910a69725 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-11 11:37:44 +00:00
defnax
6aa7cd1e14 Added "You have a friend request" label to FriendRequest Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-10 15:55:12 +00:00
defnax
e31ea01305 update ts files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5087 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-10 12:42:23 +00:00
thunder2
681ec848e0 Fixed clickable links in forum message feed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-09 15:01:25 +00:00
defnax
665b7fbf47 removed not needed button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-07 11:19:42 +00:00
defnax
70af1eccf5 Renamed "Accept Friend Request" Button to "Confirm", 
set correct stylesheet for new forum item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-06 21:29:09 +00:00
defnax
d0a9874c54 Added stylesheet for the Friend Request Buttons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-05 21:20:28 +00:00
thunder2
7756b093bf Added new basic class for a QLineEdit with a clear button - LineEditClear. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-05 21:03:03 +00:00
thunder2
1df5582e1c Enabled file preview on Windows. 
The link file to preview a not finished download is created in temp directory.
Added a messagebox when preview a not finished download to remove the link file.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-04 22:45:40 +00:00
defnax
70a7d6ce40 Added Friend Request Dialog for SecurityItem 
Fixed the horizontal spacers

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5077 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-04 15:44:35 +00:00
thunder2
af48bb9555 Removed the max length from the ip fields in ProfileWidget to display all 15 digits. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5076 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-03 19:35:11 +00:00
csoler
2cd1df7484 enabled disabling autodownload for channel admin (patch from asamK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-03 18:56:29 +00:00
defnax
fb47f06d24 Some Layout changes for MsgItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-02 15:57:44 +00:00
defnax
61f5ff5180 Improved PeerItem and SecurityItem layout 
Added icon for "Not Yet Friends"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5069 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 23:05:30 +00:00
thunder2
25a266bcbf Added new flags to the html optimizer to remove font and color from html and used this for displaying the message in the toaster. 
Fixed layout of the toasters.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 15:20:19 +00:00
csoler
5b5d5b5c43 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 08:09:04 +00:00
csoler
9ca902159b updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-31 08:01:53 +00:00
thunder2
37986e00a3 Added three new toasters - private chat, group chat and chat lobby. 
Fixed some utf8 issues in toasters and feeds.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 23:02:52 +00:00
csoler
0778e8f691 3 patches from AsamK: 
* fixed utf8 in dropping links to channels
	* fixed pasting cert links in the friend list
	* added code to allow pasting GPG certificates missing a newline at the end.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 19:43:39 +00:00
csoler
08a52dc369 fixed bug causing some transfers to never finish 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 19:33:58 +00:00
defnax
6fa38e7d18 changed Avatar icons for SecurityItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 09:30:52 +00:00
thunder2
fae86aff3b Added two new images from defnax to SecurityItem for SEC_TYPE_CONNECT_ATTEMPT and SEC_TYPE_UNKNOWN_IN. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 20:23:18 +00:00
thunder2
b32fddb3e0 Added two new functions to libretroshare for writing formatted data to std::string 
int rs_sprintf(std::string &str, const char *fmt, ...);
  int rs_sprintf_append(std::string &str, const char *fmt, ...);


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 18:15:36 +00:00
defnax
9951b36092 added icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 13:22:02 +00:00
defnax
fdea1fc309 update ts files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-29 10:21:22 +00:00
thunder2
4cb844c44d Removed most of the usages of std::ostringstream in the gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 18:02:49 +00:00
defnax
9ef7d08d2b Fixed Download link for Email Invite 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 15:48:42 +00:00
thunder2
c82c4ea8eb Set the default page of CreateChannelMsg back to the first page. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5054 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 12:23:42 +00:00
thunder2
343dced111 Removed unused member 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-27 19:40:49 +00:00
defnax
f7c3bad31b update new Spanish translation from Aitor 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-26 07:34:30 +00:00
csoler
8f69251334 small improvements to the chunk checking algorithm 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-24 14:45:33 +00:00
csoler
0e1b989e08 fixed version script (Patch form AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-24 12:40:23 +00:00
csoler
c174ad913f fixed crying smiley (Patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-24 12:21:43 +00:00
thunder2
67cf9c5f3c Changed display of the own name in FriendsDialog from "Name (me) Location" to "Name (Location)". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-22 09:01:17 +00:00
thunder2
bbdb3b9614 Added welcome message to the chat lobby. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-20 23:05:17 +00:00
thunder2
9f627783aa Fixed deadlock when receiving a chat message with open history browser. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-20 21:25:39 +00:00
thunder2
d765721e83 Modified some defaults: 
- set auto check of shared directories to 15 minutes
- set time to idle mode to 5 minutes
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-20 21:05:59 +00:00
defnax
d869b51fe5 Added icons for the Buttons in Profile Widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-20 10:30:36 +00:00
thunder2
e90b8c86d4 Added some missing locks in p3GroupDistrib. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5039 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-19 21:50:58 +00:00
csoler
633b66b1dd fixed missign delete in hash computation code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-19 13:50:33 +00:00
thunder2
e090d0a443 Fixed compile of VOIP on Windows with Qt >4.7. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-18 21:07:37 +00:00
csoler
dc22171166 added placeholder texts (Qt>4.7) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-18 12:26:15 +00:00
csoler
29fab85034 updated french translation (Contrib: Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-18 11:59:09 +00:00
thunder2
0b1126babf Added thread safe function for inet_ntoa in libbitdht. 
Used the existing thread safe function for inet_ntoa in libretroshare.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-18 01:33:25 +00:00
thunder2
117d10eb44 Fixed crash in TransfersDialog when right clicking on a download without "#define USE_NEW_CHUNK_CHECKING_CODE". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-17 23:52:10 +00:00
csoler
ded4174a13 patch from costa to add a spanish intro server 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5031 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-17 15:34:03 +00:00
csoler
c9f99c0be9 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-17 14:45:52 +00:00
csoler
456177ef11 fixed bug responsible for sending wrong checksums on windows systems 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5029 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-17 14:08:27 +00:00