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,641 Commits 63 Branches 22 Tags 194 MiB
bbae97b88d
Commit Graph

105 Commits

Author SHA1 Message Date
drbob
bec1407648 Merged Code from: /branches/v0.5-new_cache_system/ into main trunk. 
- Revisions 4771 => 5334

 * This merge brings a lot of unfinished code for GXS (new cache system)
 	- See branch commits for more details.
 * Code is disabled, and should have minimal effect on trunk build.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 15:03:16 +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
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
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
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
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
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
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
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
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
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
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
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
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
csoler
ee5dcd1a8c - moved RsAutoUpdatePage into retroshare-gui/ directory, to allow plugins to use it 
- removed VOIP code from main executable. Moved it into VOIP plugin (c.f next commit)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 15:03:07 +00:00
drbob
1eb82bd676 * Added two new Services to RS GUI. 
- The Wire, this is not at all functional yet - just a gui shell.
	- Identity, Basics of the GUI complete. talks via rsIdentity to the backend.
 * Fixed the Photo Drag and Drop under Linux.
 * Resurrected the Application Window - for Unfinished Service.
 * Moved Photos, Wire, Identity & Wiki to the Unfinished Window.
 * Added "Experimental Services" option in Settings -> though this is not yet saved / used.
 * changed #ifdef UNFINISHED -> #ifdef UNFINISHED_FD for bits in FriendList, which didn't compile.
 * removed old Unfinished Applications from Window.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-13 18:43:15 +00:00
thunder2
340a313fea Fixed bug when the user clicks on a link without http:// in a QTextBrowser. This link was opened directly in RetroShare. 
Show clickable links in the channel feed message.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 13:42:42 +00:00
thunder2
d5479940d1 Fixed RetroShare links with " characters in the name. 
Removed not used plugins from the .pro file.
Removed some warnings from lupdate.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-08 12:11:15 +00:00
thunder2
6de8541a4e Added (make functional) the lobby menu in the context menu of the gpg and group item in FriendList. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 20:53:17 +00:00
thunder2
e6816c9d6f Added new common widget FriendSelectionWidget for selecting friends and use it in CreateLobbyDialog, ShareKey (forums and channels) and MessageComposer. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 00:32:17 +00:00
thunder2
cb9111ad88 Changed the recommendation of friends from person link to certificate link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-23 22:38:50 +00:00
csoler
51cfb0c5fe added retroshare certificate links: allows to paste certificates everywhere. Users need to click on them to launch the make friend wizard on the certificate. Certificates can be copied from each location of the Friends list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-18 20:31:30 +00:00
thunder2
912e5339ca Moved the chat lobby tabs to the FriendsDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-18 20:02:19 +00:00
thunder2
35c7605704 Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too. 
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-17 20:36:36 +00:00
csoler
60bb76e3df Imported chat lobby function from branch v0.5-ChatLobby (merged commits 4682-4739) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-27 16:32:19 +00:00
csoler
3addb36e4c added unsubscribe protocol, updated GUI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-27 13:47:37 +00:00
thunder2
d07dbffa69 Added the real size of all files of a collection to the link when added with drag and drop. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-10 21:38:38 +00:00
thunder2
ac9e35160b Show the correct name in the title of the RsCollectionDialog when the filename contains ".". 
Fixed creating of the download path of the collection when running as portable version.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4715 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-08 09:16:45 +00:00
thunder2
a7ab09e453 Fixed compile on Linux. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-07 18:23:01 +00:00
thunder2
0ee35b55f4 Added new widget for hashing files. 
Added new common class FilesDefs to handle informations of file types like icons and names.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-07 13:08:12 +00:00
csoler
71a079b55f added chat lobby creation window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-12-04 22:03:54 +00:00
csoler
1b35e21ff0 2 bug fixes (by AsamK) to make rscollection files compatible with utf8 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-30 19:31:41 +00:00
csoler
e62008d493 2 bug fixes (by AsamK) to make rscollection files compatible with utf8 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-30 19:24:17 +00:00
csoler
46f1e2b562 added invitation system 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-28 22:36:13 +00:00
csoler
b01470c639 small corrections. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-27 21:46:49 +00:00
thunder2
bab7ebaa5b Added new button "Open Collection" in TransfersDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-25 23:46:41 +00:00
csoler
cd30487898 Added send and forward methods. Improved data structures. 
Next: serialization of ChatLobbyItems



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-25 21:31:52 +00:00
thunder2
031629d528 Removed compiler warnings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-25 13:32:46 +00:00
csoler
5cdc36d730 Basic methods and a bit of interface for chat lobby. 
Next:
- chat lobby algorithmics (cache+broadcast system)
- invitation handling
- specification of chat lobby window with list of known/unknown participants


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-23 22:10:37 +00:00
thunder2
f952bc267b Beautified RsCollectionDialog. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4670 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-13 13:58:39 +00:00
thunder2
e181127a30 Added new column "Last Contact" to the FriendsDialog and MessengerWindow. Moved some more basic functions to FriendsList and optimized the exisiting code. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-12 01:26:26 +00:00
csoler
43cbc153ed added dialog to select files to DL from collection files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4667 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-09 21:26:51 +00:00
csoler
072c6c7e12 fixed extension stuff for rscollection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4666 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-09 14:16:19 +00:00
csoler
50d5c1159d Added the hability to create and handle collection files. A collection file contains a directory structure 
and files that RS can DL seamlessly in the DL directory. Collection files are created from shared files
and can be handled by righ-clicking on them in Transfers and Shared files. Handling is based on the extension,
that must be "rscollection".


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-11-07 23:07:25 +00:00
csoler
78955270e2 corrected bug about wrong layout of friend list (patch from asamK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-24 16:10:24 +00:00
defnax
659814f156 fixed the FriendList layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4651 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-23 22:39:08 +00:00
csoler
521e9cb7c2 added missing files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-20 22:48:50 +00:00
csoler
6addc80e99 fixed link passed issue due to usin self-closign links (Patch from Asamk #3418941) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-10-05 16:57:33 +00:00
thunder2
b3bcfe9d30 Fixed compile on Linux. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2011-09-29 09:52:01 +00:00