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
6,422 Commits 63 Branches 22 Tags 194 MiB
4569c21cb0
Commit Graph

212 Commits

Author SHA1 Message Date
thunder2
50fcd401b1 Show "Add group" action in context menu of FriendList without groups. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 14:54:49 +00:00
csoler
1042744685 merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-29 14:18:05 +00:00
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-17 20:56:06 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
csoler
91c49fa992 added ElidedLabel to be used in places where labels might be too long and therefore trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 20:03:24 +00:00
drbob
46518ebf51 revert GUI part of svn commit 7042 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 07:29:54 +00:00
chrisparker126
f3afc128ee Chozabu patch 
- New db created for parent group id field, you will all previous gxs data
- posted now support sub post topics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 23:38:48 +00:00
defnax
50ebd781e5 * Corrected the layout of the Connect Progress Dialog 
* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-04 19:54:07 +00:00
defnax
469da4914f Added a default FileType icon for the "patch" and "diff" extensions. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 19:32:53 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-30 19:12:16 +00:00
csoler
57c66bd06f forgot to commit this: show correct connect address (local or global) depending on the current status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:12:02 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5: 
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 13:25:06 +00:00
thunder2
3e15a7bb86 Code maintenance for Qt 5: 
- Fixed some missing headers
- Fixed some deprecated functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 02:07:01 +00:00
thunder2
135a5e579a Code maintenance for Qt 5: 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 21:10:33 +00:00
thunder2
a50c899ff3 Moved help browser from MainPage to a new base class named FloatingHelpBrowser for global usage. 
Added FloatingHelpBrowser to the option window (help text not including).
The help text can be specified for the ConfigPages in the method "helpText".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-09 09:31:40 +00:00
csoler
40ed94f7fb removed copy/paste of links of type PERSON in friendlist. This caused confusion and did not provide anything useful since the creation of the full certificate links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:40:51 +00:00
defnax
440968cb98 Added a icon label to RSImageBlockWidget 
changed some icons for encrypted messages

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-25 15:58:01 +00:00
thunder2
6a9dfed408 Added new action "Load images always for this message" to image blocking. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-24 20:19:21 +00:00
thunder2
6b1613d8bb - Added blocking of embedded images (+ settings) to forums and messages 
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-23 19:53:26 +00:00
csoler
dd6fbe44ab added selection box to show only friends (already translated) in message composer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-07 14:02:24 +00:00
drbob
683e75aeef Removed Forums / Channels / Blogs stuff. 
and made GUI recompile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-07 04:21:48 +00:00
thunder2
e5d8860e21 Moved friend recommendations into the ConnectFriendWizard 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 22:51:26 +00:00
thunder2
495cc17da3 Moved service permission matrix to the left toolbar 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 21:48:23 +00:00
csoler
abd8c1e32f improved name support for distant peers in messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 20:40:28 +00:00
thunder2
cc92fdfc81 Moved the filter edit and the display button from FriendsDialog and MessengerWindow into FriendList. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 12:24:39 +00:00
thunder2
21eed4c956 - Moved display button and new forum/channel button into GroupTreeWidget 
- Fixed size of display button in FriendsDialog
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-29 20:32:14 +00:00
defnax
b5c6875706 Added default icon for the Status Message Button 
changed some default context menu icons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6643 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 23:27:46 +00:00
csoler
2109c05d26 fixed security checking of collection files to avoid xml bombs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 19:10:55 +00:00
drbob
fd66a963d2 Improvements for ProgressDialog. 
- Launch progress dialog after connectWizard.
 - fix display of location on connectWizard.
 - add cleanup code to ProgressDialog.
 - Qt4.7 bugfix.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 07:24:37 +00:00
drbob
b566d6d69c Added ConnectProgressDialog - to help people workout why RS is not connecting. 
- Pops up when you do a "Connect Attempt" from the FriendList.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-22 07:30:54 +00:00
defnax
ebbf6d9e26 Added a headerFrame to Service Permissions Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-21 16:26:34 +00:00
csoler
0b0010ff59 improved completion for chat (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-18 21:50:32 +00:00
csoler
7c6a7edfde Sorted out the mess in friends list: 
- removed entries from rightmost menu:
	* add friend: removed, already on the left bar
	* add group, recommendations and service perms => moved to context menu in friend list
	* create chat lobby: removed. Not relevant.
	* avatar and state string: removed. Can be done right at right, by clicking on the things.
- removed rightmost menu
- icons in context menu still need fixing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 22:33:45 +00:00
thunder2
9eeacf7f83 GxsForums: 
- optimized steps of the progressbar when loading
- added UIStateHelper
- removed debug output
- added Todo button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-12 17:24:11 +00:00
thunder2
f02cc51409 Identity: 
- Redesigned dialog
- Fixed high CPU usage when showing reputation list
- Added todo button

UIStateHelper:
- Added new base class for easier handling of ui elements with token request (show "Loading", set enable state, ...)

RsProtectedTimer:
- Fixed compile on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-10 21:57:23 +00:00
thunder2
c0cc792300 Added filter of items to RSTreeWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-09 11:58:55 +00:00
csoler
940ffd6d9c make friendlist fully resizable (Patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 21:45:18 +00:00
thunder2
e9db631f8f Fixed crash in completer of MimeTextEdit (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6483 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-06 15:17:34 +00:00
csoler
66d38ff1bb added column with IP for connected peers (modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 20:11:36 +00:00
csoler
90e7a3cd54 added completer to MimeTextEdit and ChatWidget (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 19:36:12 +00:00
thunder2
61d43e8e72 Disabled refill of FriendSelectionWidget after group changed when no groups are shown. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 12:27:51 +00:00
thunder2
cac96b8317 - Added some performance optimizations in FriendSelectionWidget::peerStatusChanged 
- Fixed some ui design

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-19 13:18:15 +00:00
csoler
c6a7dba418 fixed initialization of friend selection dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 20:32:10 +00:00
thunder2
e6c0217801 Fixed deadlock in FriendSelectionWidget (patch from Cyril) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-18 09:58:47 +00:00
csoler
69bf523c7a Enabled distant chat system. 
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-16 14:39:44 +00:00
thunder2
27d72c6fba Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-10 13:27:24 +00:00
csoler
0266329dc8 - Added a drop-down item to allow removing unused keys, in the Network dialog. 
- added key removal method in OpenPGP-SDK
- improved FriendSelectionDialog/Widget to enable select all/none keys, and show non friend keys
- added safe key removal method in PGPHandler. Removed keys from other locations will not cause errors.
- added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-29 21:32:02 +00:00
csoler
1dd8e9067f patch (from Henry Morgan) to make the tooltips translate-able in the group flags widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:09:05 +00:00
csoler
01a1b9dc36 patch from Henry Morgan to fix some strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 10:00:35 +00:00
csoler
50db473329 Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-22 21:42:27 +00:00