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

257 Commits

Author SHA1 Message Date
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
730554d397 improved gui message for known peers that are not friends 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:33:17 +00:00
defnax
bdecf3def1 Improving some layouts for the Feed Items 
Update Splash Image

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 00:40:28 +00:00
csoler
b8c65db00e limit max number of feed items to 500, to avoid flooding possibility. Improved text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 20:51:13 +00:00
csoler
8594d68985 improved text for security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 20:20:17 +00:00
csoler
bbdc978d00 improved display/fixed bugs in security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 19:57:08 +00:00
defnax
6fa0d894d0 clean up SecurityItem, removed unused old stuff 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 17:52:41 +00:00
csoler
613f822133 added new feed item types and logic to show connection attempts from forged certificates (e.g. bad signature, bad certificate) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-15 20:19:17 +00:00
defnax
0e134d0a92 Added to change the text for the Play Button, when file is not a media file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 16:58:52 +00:00
defnax
51ed2ca9f9 * Changed the logo size for some news feed items to use same size for better look. 
* Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 18:24:13 +00:00
defnax
beedc07de8 Added a default background color for the Channel Message Logo for a better look and feel, removed stretching of the logo, set a minimum size, background is now filled black. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 20:03:46 +00:00
thunder2
c447ab2829 Channels: 
- Use destination directory when manually downloading a file from a channel
- Show destination directory in channel details
- Fixed utf8 issue when choosing the destination directory

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-16 13:21:25 +00:00
csoler
f3750d0d61 added copy-rs-link to SubFileItem (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-02 14:56:22 +00:00
csoler
695e417fd5 changed std::wstring for std::string+utf8 in chat, and messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 21:41:34 +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
90bac2a18e Fixed some strings 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 17:16:54 +00:00
thunder2
4559b48a9d Use sslid to add a location when accepting a friend request from the security item with a known pgp key. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6668 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-01 22:18:39 +00:00
csoler
ff67c7eea4 fixed MsgFeedItem for encrypted distant msgs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-31 21:46:04 +00:00
defnax
43fecc2307 changed the peer details icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 23:52:06 +00:00
defnax
ff7b56da36 added newsfeed notify icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 16:05:45 +00:00
csoler
1e2307df47 removed quick message menu and replaced message writing so that it runs a distant message. This is most likely to be needed if the peer is not a friend or can not be connected anyway 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-08 15:09:20 +00:00
thunder2
766bd9c6ae - Fixed fill of news feed. 
- Added display of feed count in main action.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-22 00:05:02 +00:00
defnax
7bc9e2ba53 Added a new icon for "connection refused by remote peer" 
removed not good looking avatar label border stylesheet.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-21 11:45:11 +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
3b5bd220cf fixed compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-09 13:18:31 +00:00
csoler
ae5e1c7ae5 reverted last commit. Fixed the perm bug in ConnectFreindWizard (Patch from Henry Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 11:54:39 +00:00
csoler
3240b1f71b patch from Henry Morgan to use ConfCertDialog rather than connectFriendWizard from Security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 18:54:53 +00:00
csoler
1500fda2fd clicking on download for channel item marks the item as read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:32:46 +00:00
drbob
0c604d08d9 Cleanup of GxsChannels GUI. 
- disabled last references to old channels system.
 - switched on contextMenu.
 - removed FillThread.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:28:14 +00:00
drbob
f1e23599da Finished most of Comment GUI side. 
- Created GxsFeedItem to subclass all potential Gxs feeds.
 - Modified GxsChannelPostItem & PostedItem to use GxsFeedItem.
 - Added Posted and Channel Items to Comment Header.
 - Added Message Title to Comment Tab.
 - Added MessageBoxes for missing signatures in various places.
 - Changed Licence from GPL to LGPL for gxs, Posted, gxschannels.
 - Deleted Old Posted Classes that are no longer needed.
 - Added Comment Up/Down/Own Vote to CommentTree.
 - Tweaked FeedHolder fns to support GXS comments.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6225 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 21:02:43 +00:00
drbob
5ba4c8f7ff Major improvements to Comments GUI for channels and posted. 
- Split GxsIdWidgetTreeItem into two types.
 - Added Voter Id into Comment Dialog.
 - Expanded Comment display to show Votes and Score.
 - Expanded Comment Context Menu to include Voting and Reputation Options.
 - Fixed up CreateComment Dialog to include AuthorId, and enabled.
 - Completed Basic Comment Voting.
 - Made Comment Windows Closable.
 - Cleanup up Channel Posts before loading new ones.
 - Fixed up Channel Post Attachments, and Thumbnails.
 - Added View Comments button to Channel Posts
 - Misc other Bugs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6219 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-13 00:33:14 +00:00
thunder2
f4569c57bd Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 00:07:20 +00:00
drbob
da4c1e0f7f Added New Services to GUI. 
- Added GxsChannels 
 - Added New Common Comments GUI elements.
 - Moved Posted over to use Comments.
 
Lots done, but lots to do!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-11 20:53:15 +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
thunder2
72e5d10bcd Added and modified patch from Anonym 
- when an unknow user attempt to connect, show the name in the security item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-19 19:24:08 +00:00
thunder2
63d66ee53c Fixed display of "TextLabel" in SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 18:26:30 +00:00
csoler
93501bdc12 patch from AC to perform html optimization of forum posts using the canonical function optimizeHtml() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 21:35:48 +00:00
thunder2
968f72f303 Fixed missing seconds in time format. 
Added new basic class for date/time format.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:35:37 +00:00
csoler
f61a50c5a6 fixed permission of drap+dropped files. all attached files get added to extra list, but with different permission flags depending on the client. From that, we compute sharing permissions : turtle, or direct transfer only 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 21:17:00 +00:00
thunder2
a573211629 Added and modified patch from Henry 
Modified the date format according to the chosen language (locale).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 18:59:58 +00:00
csoler
6edb9eb4f8 Merged branch that provide group-based file permissions. 
Now users can sort peers into groups in the friend list, and attribute flags and parent groups to the
directories in the share manager.

Flags are B-B-N, meaning in order:
- browsable for peers in the parent groups
- browsable for everyone
- network wide for everyone
Backward compatibility makes previously BN flags been interpreted as -BN, meaning browsable/network wide for everyone.

Be careful with this new feature. It has been tested, but it's a bit early to rely on it for highly sensitive data.

The merge also includes a significant improvement of the naming of flags with incompatible types
which should sort out some existing bugs as well, since inconsistencies in flag usage have been
found during the process.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-07 20:03:16 +00:00
defnax
07d8db4505 Added to identify for Channel Files if its a media file(s) or not, to change the Play Button text from "Play" to "Open" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 16:25:20 +00:00
defnax
4009ff47cb set a minimum spacing of 1 pixel, for better look 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 15:17:50 +00:00
csoler
e753f22909 fixed flags conflicts 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 13:52:29 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 10:28:24 +00:00
thunder2
11444af4b2 Removed unnecessary values from the ui files of the feed items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-09 10:04:04 +00:00
thunder2
7502085b64 Fixed "jumping" of the items in channels and news feed when items are changed (load, toggle and remove). 
Added workaround for QTBUG-3372.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-08 23:06:34 +00:00
defnax
1b45be347b Hide request Label, when peer is unknown 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-08 12:48:38 +00:00