Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-07 05:38:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,336 Commits 63 Branches 22 Tags 196 MiB
1042744685
Commit Graph

283 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
drbob
a9a1b054dd record Permission Changes and pass to libretroshare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-25 12:22:16 +00:00
drbob
057939270f Fixed double increment bug, enabled GXS in gui by default. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-23 03:33:04 +00:00
drbob
708f6d6b43 load actual permissions from rsServiceControl 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7199 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-22 11:12:10 +00:00
thunder2
a4b54e1021 Fixed compile on Windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-21 14:50:34 +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
7815efb16f remove reference to uncommited file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-10 09:39:31 +00:00
defnax
d9aead7709 update icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-07 16:21:17 +00:00
drbob
740de02489 Added ServicePermissions Settings page. 
This just presents dummy data at the moment.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-07 13:48:33 +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
efd1447a84 removed code for old certificate format. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 14:42:16 +00:00
drbob
45bd72203e Added TOR Configuration page. Allows STD Nodes to configure Proxy too. 
Moved most of hidden node parameters to this page.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 06:27:02 +00:00
csoler
affdd49001 made cert of versions 0.5 and 0.6 incompatible. Removed old cert format parse/display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 16:53:19 +00:00
drbob
ee09c3ce9c Allow Local Address to be saved and modified in hidden mode. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 05:05:35 +00:00
drbob
bbe3ee8d2f - Switched to new RsAccounts interface. 
- Reworked ServerPage to support HiddenNode configuration.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 02:35:06 +00:00
defnax
90fa8128d0 Enabled, to get selectable/copyable by mouse the RS version number Label 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-11 13:42:04 +00:00
defnax
93c331f40b * Enabled min and max buttons for settings window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 19:59:25 +00:00
csoler
fc56b95d3f show fingerprint in ConfCertDialog, and splitted the string with spaces. Removed the use of the ambiguous peer id for both pgp and locations ids 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-09 22:52:26 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5: 
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 13:25:06 +00:00
thunder2
3e15a7bb86 Code maintenance for Qt 5: 
- Fixed some missing headers
- Fixed some deprecated functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 02:07:01 +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
csoler
08c585df2d fixed typo 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-14 19:57:06 +00:00
csoler
8e220c691b added help string for notify page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 12:16:46 +00:00
csoler
cf8d6682da added help string for relays 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 12:02:50 +00:00
csoler
7d3f8b5c10 added help string to plugins page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 11:43:15 +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
defnax
1d83754385 fixed to show the General tab by default 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-08 14:24:21 +00:00
csoler
9b8d597c0d added fingerprint to cryptopage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 21:01:05 +00:00
csoler
e4e28c733c added the possibility to distant chat with unverified identities, while warning the user about it. Should help distant chatting. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 20:49:02 +00:00
csoler
4e259fecfd allow max storage duration to be 0, in which case we keep all history 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-29 12:10:59 +00:00
drbob
ba157e4891 Fixes for visState -> vs_disc & vs_dht. 
Added RTT Gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-29 07:10:19 +00:00
csoler
e21d869006 - added history parameters for chat lobbies 
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:18:44 +00:00
thunder2
6b1613d8bb - Added blocking of embedded images (+ settings) to forums and messages 
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-23 19:53:26 +00:00
drbob
1d6f99de0d mods to support hidden nodes, and hidden certificate sharing. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-09 02:11:43 +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
drbob
a45a70a1d5 Tweaks to the GUI for removal of RsIface class. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-21 21:39:40 +00:00
thunder2
1c4f68bc60 Disabled setting "Start RetroShare when my system starts" on Windows when running the debug version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-08 12:46:32 +00:00
thunder2
c4c5eb5399 - Fixed crash when closing the main window without the setting "Minimize to Tray Icon" 
- Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray Icon" and fixed wrong usage
  Please check your setting!
- Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-04 23:53:29 +00:00
csoler
7dbc17b2a4 Enabled distant messages. These need to be switched on the config->Messages. GUI improvements needs to be done, such as properly setting peers names everywhere, but the service works. Have fun using it! 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-04 14:11:59 +00:00
csoler
3f86a707b7 Distant messages GUI code. Now the GUI can receive/send/decrypt distant messages. Since the protocols are not finalized, the GUI is disabled, to avoid later crashes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6549 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-31 16:34:34 +00:00
csoler
2e32892a27 moved all files related to file transfer in gui/FileTransfer/ 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-14 12:53:38 +00:00
csoler
33f4e5b779 fixed deadlock (reported by Like) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 19:22:02 +00:00
thunder2
e1ee7cca9c Fixed layout of distant chat page in settings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 18:09:13 +00:00
thunder2
c6e2034b66 - Fixed typo (patch from Henry) 
- Updated english translation.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-19 16:24:07 +00:00
thunder2
cac96b8317 - Added some performance optimizations in FriendSelectionWidget::peerStatusChanged 
- Fixed some ui design

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-19 13:18:15 +00:00
csoler
69bf523c7a Enabled distant chat system. 
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-16 14:39:44 +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
thunder2
dd0ef691c5 Fixed online time in profile widget. 
Fixed width of settings dialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 21:12:38 +00:00
csoler
1353cd3411 restored the profile manager, but only kept the export button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6251 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:10:54 +00:00
csoler
a850b18be2 renamed Security page Profile. Disabled profile manager for now, since generating a new profile while RS is running corrupts the current session. More work is needed to make the profile manager usable which RS is running. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6241 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 14:16:22 +00:00