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
5,015 Commits 63 Branches 22 Tags 194 MiB
85c089b09b
Commit Graph

5015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
0aa921b010 fixed variable collision 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-16 21:02:20 +00:00
thunder2
3521bfb6de Added multiselective mute/unmute to chat lobby. 
Added mute/unmute with double click on icon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-16 00:53:13 +00:00
thunder2
182792e538 Update english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:37:34 +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
8a3973de81 fixed command to grab upnp patched version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 14:18:52 +00:00
defnax
4c077eda2e update Chinese translation from transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 12:34:33 +00:00
csoler
4e2f454907 reduced calls to flags/group update code to the minimum, to avoid sending file lists except when the share manager / share dialog gets closed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 22:56:25 +00:00
csoler
7fa9dbb2b1 patch from AC to solve compilation w.r.t. patched libupnp whatever the version number. Should work on debian as well. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 20:24:07 +00:00
defnax
40b80c4e84 redesigned the Chatlobby participants list 
- used now QTreeWidget instead of a QListWidget
- added icons for display the muted participants
- added context menu for "Mute participant" ( context menu fix from thunder)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 14:39:08 +00:00
csoler
d3a3efd492 added additional checking of incoming compressed chunk map, in case the data is currupted, which might happens with a corrupted ft_transfer.cfg file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-13 20:13:09 +00:00
csoler
f1d3cf102f display correct group string instread of group ids in SharedFilesDialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-13 19:37:51 +00:00
thunder2
9581e83c01 Fixed compile under Kubuntu 12.10. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-13 11:58:56 +00:00
csoler
454daf1981 Iproved file list handling: 
- Implemented correct cacheData send to clients usign constant subid value.
- At start, the association between peers and available file list is always recomputed
- overloaded cacheAvailable() and refreshCache() in FileIndexMonitor
- added callback in rsFiles to force re-generating cache items when group layout has changed
- force re-sent file lists when moving peers between groups in the GUI
(Fixes group leaking problem) Needs full recompilation of libretroshare.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-12 22:51:27 +00:00
thunder2
03dbf7bc1b Added patch from Henry 
Correct "Hungarian" to "Magyar" in language settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-12 17:04:37 +00:00
defnax
818e8cf0d2 fixed the item order, name item was on wrong place 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-12 16:51:36 +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
csoler
9000cf9034 patch from thunder to handle connexion break correctly, and therefore avoid false notification attempt of friend. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 19:28:45 +00:00
thunder2
7e08576c52 Added flag for hungarian language. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 15:17:51 +00:00
thunder2
a1abb0e3c6 Fixed sorting of date in forums. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 15:14:15 +00:00
csoler
bdc275e15f suppressed unitialized memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 12:57:05 +00:00
csoler
ab26059570 added missing mutex in destructor of ftFileProvider. Probably responsible for some random crashes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 10:29:03 +00:00
thunder2
2147ea63d2 Added hungarian language files. 
Added missing language files to the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 00:55:15 +00:00
csoler
929f872544 Added new link type: EXTRA_FILE, to allow sendign links with sources included so as to trigger direct transfer. 
This makes possible to send files through chat without permitting tunnel access to the files. The client requests
the file as a direct transfer only, using the supplied source.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 22:59:51 +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
thunder2
59ed165c81 Saved group ids instead of group names for the group-based file permissions. 
Translated group names in Share Manager.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-09 00:46:41 +00:00
csoler
786177eaf0 Files being downloaded anonymously are declared as available with flag DIR_FLAGS_NETWORK_WIDE_OTHERS. Fixes bug that prevented swarming to happen 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-08 19:47:39 +00:00
csoler
5e913feee7 fixed bug of transfers not handled by turtle router. This was due to a change is values of flags. I added a test to update flags from loaded transfer infos to convert them properly. Just restart your RS and your transfers will perform normally. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-08 19:18:45 +00:00
defnax
8640194c83 update nsis script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-08 10:13:01 +00:00
thunder2
14e3b4179a Cosmetic changes in ShareDialog 
- Removed context help button.
- Changed the standard dialog buttons from single buttons to buttonbox.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-08 00:58:20 +00:00
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