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,936 Commits 63 Branches 22 Tags 194 MiB
3a72a3032a
Commit Graph

4936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
3a72a3032a corrected debug state committed by mistake in the previous merge operation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-07 20:13:44 +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
thunder2
9b5ee85fd0 Removed context help button from the dialogs (currently not used) and added minimize/maximize buttons to the "floating" dialogs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 23:26:47 +00:00
csoler
ef09075170 gui tweaks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 21:24:49 +00:00
csoler
a2f958b956 disabled flag DIR_FLAGS_NETWORK_WIDE_GROUPS for consistency reasons. We might extend it to rsCircles later. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 20:46:56 +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
thunder2
adee9517c1 Removed some unnecessary filter icons and added some new placeholder for the filter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 00:28:11 +00:00
csoler
65146b77d9 fixed bug in permission check 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5776 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-04 15:15:36 +00:00
csoler
9a6b675657 fixed bug in gpg_id vs. ssl_id (grrrr) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-04 15:01:43 +00:00
csoler
997e833cc8 debugging tunnel handlign with permissions 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-04 14:52:38 +00:00
csoler
6b6f961e94 added contextual message to explain current group sharing permissions 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 17:15:47 +00:00
csoler
d77c73adf4 loading/saving parent groups for directories. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 15:25:25 +00:00
csoler
1762c7a842 finally fixed layout. Bloody Qt 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 14:30:04 +00:00
csoler
b616b2cabd tried to fix gui layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 14:15:03 +00:00
csoler
ccd08df35d added widget for group selection. Used it in share dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 17:26:20 +00:00
csoler
bd37e78884 debugged search functions 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 14:25:35 +00:00
thunder2
a9f70d0685 Added back minimize button for StartDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 14:01:31 +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
csoler
42deb4edea updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-01 12:12:24 +00:00
csoler
dc82cee700 First shot of file sharing permissions. Compiles, but needs some testing/debugging. 
- added type-safe flags in retroshare/rsflags.h. This should be used to make new flags types in order to prevent mixing flags up in function prototypes.
- group handling is left to rsPeers. We'll move it to rsCircles later.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-01 10:06:12 +00:00
thunder2
afa3248429 Moved loadCertificate from main, StartDialog and GenCertDialog to Rshare. 
Switched StartDialog from QMainWindow to QDialog.
Updated english translation file.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-01 01:07:36 +00:00
defnax
aadb408533 Added icons for the Channel TreeWidget 
Added placeholder text for Search Filter items on Group TreeWidget
Added placeholder text for Search Filter items in Messages Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-30 02:44:14 +00:00
defnax
bfe037e029 set LayoutVertikalSpacing to 1 for Channels Tree 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-30 01:14:40 +00:00
thunder2
7012a00cd0 Update english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-29 14:47:58 +00:00
defnax
df3f0e0884 update the authors on the help page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-29 12:13:34 +00:00
thunder2
e99b30d015 Redesigned GenCertDialog for the usage in Profile Manager. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-29 11:02:03 +00:00
thunder2
a7c29c0f24 Removed the filter comboboxes and replaced it with a menu in LineEditClear. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-29 10:59:26 +00:00
csoler
68f48a802c fixed some GUI bugs in network simulator 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-28 12:14:27 +00:00
thunder2
af2257b1a9 Added settings for the blinking icons 
- private chat window/tab
- chat lobby tab
- all tray notifier

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-27 15:59:12 +00:00
thunder2
03e521c024 Moved settings for private chat from NotifyPage to ChatPage. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-27 15:51:34 +00:00
defnax
c7c695600f Added a find Icon Button for the class LineEditClear 
Removed all not needed find icons from the Dialogs.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-26 15:14:40 +00:00
thunder2
9ea1a7ab24 Renamed new sound event from "Download ready" to "Download complete". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-26 13:01:58 +00:00
defnax
06926a64c0 Enabled sorting for the Lobby Dialog 
Added a placeholder text for the Search Forum filter

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5725 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-26 11:55:28 +00:00
drbob
cc9e933362 Improved the dht msg history storage. 
- specify how long we store for.
 - cleanup old msgs.
 - improve printing of history.
 - add timeline storage as well.
 - disabled by default, enable USE_HISTORY in bdnode.c

There appears to be a bug related to copying bdId's around.
Some of the bootstrap ids are malformed, and this crashes rs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-25 22:36:22 +00:00
drbob
83795a7c7d Fixed stupid bug. Labels are the wrong way around. 
This meant limit is set to HIGH (50msg/sec) when it should be LOW (5msg/sec)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-25 18:50:47 +00:00
thunder2
7272b7e768 Added blinking of the chat icon for private chat window and chat lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-25 18:06:33 +00:00
thunder2
179618edbf Added blinking of the systray icon for the notifier and enabled it for private chat. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-24 13:24:38 +00:00
thunder2
a6cb81fd43 Cleaned includes in FriendsDialog.cpp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-24 13:22:14 +00:00
thunder2
9953b3b640 Fixed switching between combined and not combined tray icon notify with available messages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5719 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-24 08:34:42 +00:00
thunder2
b3d1e75455 Added sounds when message has arrived and download was finished. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-23 20:54:07 +00:00
thunder2
c1c9894daf The next unread button in forums search for child items and start at the top when the end of the list is reached. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5716 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-23 20:51:35 +00:00
thunder2
232af8e71e Changed SoundManger to allow the plugins to play sounds. 
Added example to VOIP (commented out).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-21 21:38:55 +00:00
csoler
03d4936b12 improved display in share manager. Updated RemoteDirModel to show groups. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-21 19:39:56 +00:00
csoler
56e26ba00a First bit of group sharing permissions 
- Added icons for share flags
- added new class to handle sharing permission widget
- Updated share manager
to be continued...



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-21 14:06:33 +00:00
thunder2
56635e4ce4 Added more PRE_TARGETDEPS for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-21 11:51:38 +00:00
csoler
331212c010 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5699 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-20 13:37:53 +00:00
csoler
6ea39194db removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-20 13:36:03 +00:00
csoler
7a1a188757 removed unnecessary file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-20 13:11:59 +00:00
csoler
7080b4e4dc - merged linkscloud plugin with main packaging script set 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-20 13:10:58 +00:00