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,395 Commits 63 Branches 22 Tags 194 MiB
2c0a22b68e
Commit Graph

91 Commits

Author SHA1 Message Date
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
thunder2
741424dd72 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 21:23:56 +00:00
thunder2
9eaea5de12 Updated english translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-14 11:41:34 +00:00
thunder2
57b906bdd2 Removed include of "pqinotify.h" in VOIP. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-08 11:13:01 +00:00
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 22:25:49 +00:00
thunder2
dbfe3f6c51 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 18:51:12 +00:00
thunder2
607458dad7 Added missing language files. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 16:12:16 +00:00
thunder2
3d48e8b4cb - Added language Catalan (ca_ES) 
- Updated english translation
- Updated languages from Transifex

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 15:08:36 +00:00
thunder2
0ad20e6911 Updated german and french language from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-24 07:42:13 +00:00
thunder2
758b5d0079 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-23 11:07:17 +00:00
defnax
3ba5a72787 added the toaster files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-22 12:04:11 +00:00
defnax
41e22a1b21 update voip strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-21 12:45:20 +00:00
defnax
06f6f1949d changed the voip icons, disable the voip buttons when friend is offline. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-20 16:59:29 +00:00
thunder2
41ba665813 Code maintenance for Qt 5: 
- LinksCloud
- VOIP
- FeedReader


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-20 00:56:34 +00:00
thunder2
30103ef5f2 Added display of Qt version in AboutDialog. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 22:12:31 +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
defnax
8f6f7b50d6 added some icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-17 14:56:53 +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
thunder2
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 12:13:09 +00:00
defnax
9ca0775933 added some sound files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:50:36 +00:00
defnax
a4524485ad changed the voip icons and the tooltips 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:00:16 +00:00
drbob
90b4a20e5d updated VoIP to use new Fast packet sending. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 13:15:10 +00:00
thunder2
0d41814aef Updated languages from Transifex ;-) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-10 20:55:59 +00:00
thunder2
570d8db1d5 Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-14 05:23:35 +00:00
csoler
dc2521cf71 Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410). 
- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-06 19:58:30 +00:00
thunder2
d44d3055c7 Added new languages - Greek and Dutch. 
Update languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-04 23:39:07 +00:00
csoler
cb9f174efa added tunnel state light to distant chat popup dialog. Added proper peer name. Changed method for adding widgets in the chat bar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 22:43:19 +00:00
thunder2
4866c5585b Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6217 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 22:14:42 +00:00
thunder2
7f06b1e9b8 Removed special settings for win32 from VOIP.pro. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-06 00:01:05 +00:00
csoler
99c5633a63 patch from Henry Morgan to unify compilation settings for VOIP 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-04 12:34:45 +00:00
thunder2
e66a9117e2 Added patch from Henry 
- fixed typo in FeedReader
Updated english translation.
Updated languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-22 15:47:12 +00:00
thunder2
a28267a8e7 Updated translations from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-14 00:29:10 +00:00
thunder2
8596b2ca9e Added patch from Henry 
- enable italian language
Updated languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-06 14:31:40 +00:00
defnax
7339af3a21 corrected string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 15:55:01 +00:00
defnax
9721b5a924 renamed translation string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 14:21:22 +00:00
defnax
980b789809 update Swedish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-30 16:45:13 +00:00
defnax
df7229af91 update danish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-30 15:43:11 +00:00
thunder2
2231dccc1b Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 22:10:39 +00:00
csoler
9c1d702128 patch to allow compilation on BSD 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-18 16:22:58 +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
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
7078cc1c8e updated revision numbers in VOIP and LinksCloud plugins 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-20 13:09:16 +00:00
defnax
50351b6b27 Added to display tooltip's for the Voip button's 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-17 12:08:30 +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
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
thunder2
839cf43f99 Fixed translation of the plugins on Linux. 
Renamed the language resource files of the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-03 22:59:28 +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
e7ff4bbab8 Plugin LinksCloud: 
- Fixed crash when clicking on the link.
- Fixed process of https links.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 13:16:51 +00:00