Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-30 09:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,555 Commits 63 Branches 22 Tags 196 MiB
2dba7e96bc
Commit Graph

4555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
a91e859b66 added dialog box to import existing keyrings when starting the new pgp version for the first time 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5210 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 21:01:22 +00:00
csoler
2e05d0ef01 moved tests to test directory 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5209 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 18:45:35 +00:00
thunder2
080510bc97 Added patch #3510849 from Adam (interfect) 
Capitalize "copy RetroShare key to clipboard"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5208 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 17:59:45 +00:00
thunder2
0989897696 Fixed sorting (case insensitive, numbers) in SearchDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 14:14:04 +00:00
thunder2
e5a25b94f0 Added "file:///" to "%style-dir%" for the chat styles. 
Renamed "RetorShare" to "RetroShare".
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-08 22:06:28 +00:00
csoler
af1fe976e2 exposed generic ID type in util/, patched rest of the code to use it. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5197 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-06 20:31:19 +00:00
chrisparker126
c78ca83090 added an error output for invalid image_size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5195 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-04 13:36:59 +00:00
chrisparker126
94729aae4b bug fix, avatar item deserialisation unsafely assumes valid image length. caused crash on windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-04 12:49:54 +00:00
thunder2
ff6276e920 Changed chatstyle structure from 
[RS-Dir] / stylesheets / {public | private | history} / my_chatstyle /
to
[RS-Dir] / stylesheets / my_chatstyle / {public | private | history} /

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-01 21:48:53 +00:00
thunder2
569d463f02 Optimized the fill of the up- and downloads in TransfersDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-01 20:51:14 +00:00
csoler
40b1f6f053 fixed incompatibility with Qt < 4.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-25 19:29:09 +00:00
defnax
bd67b1fe90 forget to commit this 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5189 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-25 07:49:42 +00:00
csoler
3787b14fd4 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5188 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-25 07:39:47 +00:00
thunder2
50bc57b0fe Sort participants list in the chat lobby case insensitive. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-24 19:26:43 +00:00
defnax
55b6211e7e update version string and changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-24 12:02:34 +00:00
thunder2
1855d19436 Added check for empty lobby nick name. 
Moved notify of lobby nick name change from the gui to p3ChatService.
Added missing mutex locks for p3ChatService::_default_nick_name.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-23 22:33:45 +00:00
thunder2
917f9913df Added patch from Imanuel 
- Added new placeholder %style-dir% for ChatStyles.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5183 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-23 13:24:04 +00:00
thunder2
56e156a65a Fixed replacing of %color% in ChatStyle. It should not be replaced after %message%. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-23 09:19:50 +00:00
thunder2
22a0f89751 Redesigned ConnectFriendWizard as ui file. 
Added new base class DropLineEdit.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-22 22:24:10 +00:00
thunder2
25547d0ea8 Added patch from braindead: 
changed base-class of AvatarWidget to QLabel

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-21 19:37:38 +00:00
thunder2
443703e61f Switched back to not optimized compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5178 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-21 19:06:16 +00:00
thunder2
a7eda64872 Fixed compile on Linux. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-20 16:53:28 +00:00
thunder2
b344aebbe6 Added changes from braindead: 
- simplified avatarwidget
- prepared property-dependend stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-19 22:18:15 +00:00
csoler
ce22ab5be9 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5174 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-16 21:35:37 +00:00
thunder2
e2746efb85 Optimized RsCollectionDialog (still without thread). 
Enabled extended selection and mark with the key 'space'.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5173 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-16 18:58:52 +00:00
csoler
5fbb6448d3 main enabled notifyQt after creation of GUI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5171 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:35:05 +00:00
csoler
6c9d701506 forgot ifs in notifyQt 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:32:36 +00:00
csoler
c0088f3e8f removed data race in QObject::connect() vs. NotifyQt signals by enabling notification signals only after GUI is created 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 20:25:53 +00:00
thunder2
14c1f9f599 Added dynamic locking function for the OpenSSL library. 
This is needed when using OpenSSL from multiple threads.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-15 13:51:24 +00:00
csoler
ba56f5f611 fixed memory leaks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-14 20:01:00 +00:00
defnax
39c3d013f5 Improved the default recommendation text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-14 14:14:38 +00:00
csoler
c0e066598d switched chunk per peer and max chunk age to previous values, now that chunk cannot be slowed down by slower peers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-13 20:08:59 +00:00
csoler
ad5ca59a7a Fixed signature parsing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-13 19:04:13 +00:00
defnax
a25e609e2f Added a default styleSheet for the "Confirm Friend / Add as Friend" Button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5163 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 23:44:48 +00:00
thunder2
27c0535a8a Fixed handling of html links in HandleRichText::formatText. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5162 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 16:04:18 +00:00
csoler
02a7548de4 removed possible data race on boolean value (Not critical) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5161 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 13:10:57 +00:00
thunder2
dc2d6c975e - Moved HandleRichText from the folder "chat" to "util" and redesigned the source 
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request)
- Added new ObjectPainter for painting a button on a pixmap


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 00:40:53 +00:00
notdefine
5a3863d216 Improved mute feature, to update Blocklist, when the peer changes his name. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-11 20:53:27 +00:00
csoler
f6c6af8b59 removed non-mutex-protected reference 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5157 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-10 19:04:31 +00:00
csoler
f5c345659a Improved multi-source file transfer in two ways: 
- tunnels can borrow data chunks from only slower tunnels, to prevent blocking fast tunnels
- tunnels can handle up to 50 data chunks at once instead of 5
Multi-source transfers are generaly faster and more stable.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5156 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-09 21:31:05 +00:00
defnax
438651f693 update language strings and corrected connect attempt message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-09 13:49:23 +00:00
notdefine
5bdd490a4d Remove debug message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-07 21:43:21 +00:00
thunder2
ec501c6d6a Fixed issue with lost downloads when RetroShare exits (or crashes) during the load of the file transfer items. The pending list was not saved. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-07 14:54:46 +00:00
defnax
e23f7e1055 update translation strings, 
changed recommend friend context menu icon

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-07 14:43:25 +00:00
notdefine
d5bdae7bd9 Display old and new nickname to Peers during nickname change in ChatLobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 22:57:08 +00:00
notdefine
22bfcb62bc Preparation for mute Peers in the Chat Lobby. 
RS_CHAT_LOBBY_EVENT_PEER_CHANGE_NICKNAME is send, when changing nickname, so the blocklist can be updated (in future).

This will never wort for 100% as discussed in the developer forum, but should stop the most spam.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 22:19:59 +00:00
csoler
22a8e6f3c9 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5149 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 20:32:19 +00:00
csoler
7382f7552b utf8 patch for notifyqt from AsamK 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-06 11:48:02 +00:00
thunder2
78fd91ce4a Fixed update (repaint) of the placeholder text of the quick view items in MessagesDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 22:29:59 +00:00
thunder2
b81a911793 Friend recommendation message 
- renamed subject
- added to system message
Recompile needed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-05 22:20:05 +00:00