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

3012 Commits

Author SHA1 Message Date
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
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
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
defnax
ec78725d90 update win installer script, to install turkish Qt translation 
renamed Bubble Compact folder

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5683 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-16 12:48:04 +00:00
thunder2
cbbbbda17d Added and modified patch from Henry 
- Changed some language strings in the GUI
- Added attempt to load the translations for the Qt's internal srings from datadir/translations


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5682 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-15 21:17:57 +00:00
defnax
5bded75b0c Moved the Send Button to right side of the Chat LineEdit for better look. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-15 13:49:47 +00:00
defnax
965ecae223 Added Bubble Compact Chat style 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-14 23:13:50 +00:00
thunder2
cfc403598d Removed not needed file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5676 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-14 16:25:30 +00:00
thunder2
bc41be1f9a Added patch from Henry 
Removed hardcoded fonts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-14 12:25:12 +00:00
defnax
70dbbaf537 added turkish Qt translation for Qt Widgets/Buttons, Qt has not jet turkish translation, translated some needed QWizard buttons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5673 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-14 01:59:27 +00:00
thunder2
8fda24ef64 Added some new string to the translation in VOIP. 
Updated german and english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5671 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-13 17:43:36 +00:00
thunder2
a0162ced8f Changed the path for the external translations to "data dir/translations". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5670 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 18:44:02 +00:00
thunder2
85070b1b66 Addad patch from Henry 
Support for custom qss in data dir and config dir

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 18:42:24 +00:00
defnax
e22a9afadf update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5668 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 14:42:54 +00:00
defnax
c63aed1cfa updated and corrected the french translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5667 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 11:15:47 +00:00
defnax
00e135af43 corrected spanish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5666 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 09:54:17 +00:00
thunder2
ae09f3bdaa Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5665 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 08:11:05 +00:00
thunder2
8c5fd1d124 Added and modified patch from waseihou 
Added support for external translation files for the main application and the plugins LinksCloud and VOIP.
The following files are loaded from the directory <executable dir>/translations
- retroshare_*.qm
- LinksCloud_*.qm
- VOIP_*.qm

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 23:46:54 +00:00
defnax
cc84a0338e * removed html strings from GenCertDialog 
* moved some description text from the header, to look better
* update translation strings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5663 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 13:52:25 +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
51033eb060 Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-10 13:38:56 +00:00
thunder2
091cab4d10 Changed window CreateForumMsg from QMainWindow to QDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-10 13:36:54 +00:00
thunder2
b67f9f88fe Changed the standard dialog buttons from single buttons to buttonbox to have a standard layout and a standard translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5657 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-10 10:51:53 +00:00
defnax
e10ce3ff35 move the Buttons to end of the right side, when the Contacts dockwidget is enabled. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5654 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-09 15:37:04 +00:00
defnax
cf8cc496b8 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-09 15:04:45 +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
52c26dae30 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-08 14:43:07 +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
defnax
79f067732c Improved (ungendered) English friend recommendation message (patch ID: 3536093 ) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-04 21:19:49 +00:00
defnax
fbf8a76cee update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5635 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-04 12:15:37 +00:00
defnax
3da6c108e0 update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-02 12:49:19 +00:00
thunder2
9053e9b8ec Fixed title of the import identity dialog in the Profile Manager. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5629 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-01 20:21:06 +00:00
thunder2
ee8aac48a5 Updated english translation file of RetroShare and added the english translation files of VOIP and LinksCloud for Transiflex. 
It is not needed for RetroShare.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 16:56:32 +00:00
thunder2
a24f7b5134 Fixed edit of a message with plaintext. The newlines remain unchanged. 
(investigated by braindead)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 16:20:38 +00:00
defnax
b6bd1e9f8e update translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5621 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 02:16:41 +00:00
defnax
f3d251f70e update turkish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5617 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-28 15:09:33 +00:00
thunder2
85c93d0b9a Fixed reply to a message with plaintext. The newlines remain unchanged. 
(investigated by braindead)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-27 20:32:28 +00:00
thunder2
805f64808e Added patch from braindead 
- Added new base class MimeTextEdit to paste images from the clipboard into a QTextEdit and added this in MessageComposer and private chat.
- Disabled paste of images for the next stable release.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5613 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 23:32:53 +00:00
thunder2
1d76628181 Reduced fix width of the SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 23:01:34 +00:00
thunder2
b40a716e87 Fixed sensitivity of the action in the context menu to copy a link from the chat text when scrollbars are visible. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 17:52:58 +00:00
defnax
9f1b19bd98 stored some license files to utf-8 encoding, required by nsis installer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5607 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 15:44:30 +00:00
defnax
b2e88b2ed2 update version and changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 12:26:27 +00:00
thunder2
5726c1ec18 Fixed crash when closing the settings dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 23:51:13 +00:00
thunder2
e6db506cb2 Fixed crash and memory leak in the AudioWizard of the VOIP plugin. 
Please use at least Qt 4.6.4 when compiling RetrosShare with the VOIP plugin because of the fix of the bug QTBUG-11883.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 23:08:46 +00:00
thunder2
3b0ebe1b6b Changed font color in ProfileWidget to standard. 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 21:01:07 +00:00
defnax
181983be10 corrected installer translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5595 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 14:07:56 +00:00
defnax
b7f6b66f39 update rsgui version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 13:46:57 +00:00
defnax
bfd5d7ddfa update installer script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5593 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 13:36:38 +00:00