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,793 Commits 63 Branches 22 Tags 194 MiB
03d4d5e949
Commit Graph

6793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thunder2
6085ccd43f Fixed crash in GxsIdChooser. The TokenQueue was not deleted in the destructor. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7499 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-29 11:22:54 +00:00
defnax
21b0479159 renaming string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-27 12:56:01 +00:00
defnax
3a8541291a * beautify DHT details 
* Added to display the Bandwidth details,Turtle router, Global router into the DHT Window
* Now the DHT Details, will be a place to view all the details about the DHT, Bandwidth, Turtle & Global router and more.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-26 23:03:17 +00:00
thunder2
99b55fbe65 Changed plugins to the new interface 
rs_pqi_service -> p3_service

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-26 22:16:32 +00:00
csoler
8b39ca5a2e added name and location to certificate link, to ease display in web forums, html pages etc. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-26 18:52:21 +00:00
csoler
9781982811 added missign file from previous merge 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-26 17:14:40 +00:00
csoler
f6db432c74 Merge of branch v0.6-rssocialnet 7419 to 7488. Changes from electron and myself: 
- added possibility to modify groups (e.g. edit circles)
- fixed mismatched free/delete in fimonitor.cc, authssl.cc, pqibin.cc (saving encrypted hash cache file)
- improved plugin interface class to allow plugins to access GXS objects.
- added method to un-register notify clients from RsNotify
- fixed pqisslproxy for windows, due to win not properly supporting sockets in non blocking mode.
- removed static members form RsInitConfig and made RsAccounts object a pointer. This prevents plugin initialisation problems at symbol resolving time.
- removed bool return from p3IdService::getOwnIds()



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-25 21:07:07 +00:00
defnax
906efa6f6c renaming tool tip 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-13 13:19:22 +00:00
defnax
a6e70a2db4 set a default header size for the Author column 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-11 13:39:43 +00:00
defnax
67b1d49885 fixing spelling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7489 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-09 15:55:48 +00:00
defnax
ff366f0ec2 Added Phenom's Patch Fix_NonBreakingSpace_0.6_7480.patch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-07 23:07:16 +00:00
csoler
9f1f08b332 fixed compilation for ubuntu 12.04 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7485 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-07 12:52:15 +00:00
thunder2
f60b37a213 Added a new setting to channels to enable/disable threaded loading. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-06 17:41:22 +00:00
thunder2
27c2ed0a97 Close feed item in files view when a channel is loaded. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7483 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-06 17:33:48 +00:00
thunder2
c2624309e9 Forgot to clear the list of files when a channel is loaded. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-06 15:02:22 +00:00
thunder2
899aa36fb8 Added new files view to channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-05 20:50:55 +00:00
thunder2
7a65ad1a14 Added threaded loading of channel posts. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-01 18:54:55 +00:00
defnax
2d2e3881cf Fixed the stylesheets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-01 16:19:07 +00:00
thunder2
d13aa90b2b Added basic widget RSFeedWidget for showing feed items in a QTreeWidget as replacement for the QScrollArea. 
- Use sort of QTreeWidget
- Filter items
- Open/collapse selected item with +/-
- Remove selecteds item with dselete key

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-01 14:49:58 +00:00
thunder2
e588b25b67 Added new method to GxsFeedItem to set content with QVariant. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-27 18:29:35 +00:00
thunder2
3458cdc8fc - Added copy link to GxsFeedItem (GxsChannelPostItem) 
- Fixed copy link of GxsGroupFrameDialog
  - utf8 issue
  - removed unread message count from group name

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 23:52:45 +00:00
thunder2
8427c92486 - Added picture support to channel gui 
- Removed picture support from forum gui
- Disabled share key in GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 22:29:53 +00:00
thunder2
eacb69f155 Disabled share key of groups until it's working. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 21:18:03 +00:00
thunder2
2347f9e9b1 Added new icon for Posted (patch from defnax) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 16:09:54 +00:00
thunder2
1485361a1e Fixed Windows compile of VOIP with Qt 5.3.1 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-26 11:38:34 +00:00
thunder2
d20ce41c96 - Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application 
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 23:26:04 +00:00
thunder2
6792348402 - Moved settings for user notify into the base class 
- Removed defines TRAYNOTIFY_...

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 20:01:12 +00:00
thunder2
d355e8dd88 Reworked/fixed some settings. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 16:52:11 +00:00
thunder2
42e579a294 - Added settings page for Posted. 
- Added new base class for GroupFrame settings for settings pages.
- Moved usage of GroupFrame settings (forum, channel and posted) to base class.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 14:54:23 +00:00
thunder2
0bcc8697ef Added subscribe button to Posted. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-23 20:04:25 +00:00
thunder2
1de9e4a842 Added new base class GxsMessageFramePostWidget for post-based services like Channels and Posted. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-23 18:51:56 +00:00
defnax
b1f7523248 use correct icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-22 22:16:22 +00:00
thunder2
30fcab1bff Posted: 
- Used GxsGroupFrameDialog
- Added tabbed interface
- Added user notify

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-22 15:04:36 +00:00
csoler
c6103b7535 added bandwidth measurement for video. Still needs codec to accound for it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-20 20:50:36 +00:00
thunder2
9c3266fdd9 - Added two new members to GxsGroupStatistic/GxsServiceStatistic - mNumMsgsNew, mNumMsgsUnread 
- Set mGrpId on GxsGroupStatistic
- Changed GxsUserNotify and GxsGroupFrameDialog to statistics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7462 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-20 19:35:33 +00:00
chrisparker126
5399618cef completed addition of get statistic feature of gxs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7461 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-20 11:21:06 +00:00
chrisparker126
be20086e09 adding new test for stats feature 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-19 21:26:45 +00:00
chrisparker126
a29f382175 fixed unit test compile 
updated support file for unit test


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-19 19:08:27 +00:00
chrisparker126
99519f14bd last bit needed have statistic functions 
- getgrpstatistic and getservicestatistic should be working now


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7458 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-19 08:29:56 +00:00
chrisparker126
da335802e2 Added statistic calculation and retrieval 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-19 08:00:06 +00:00
csoler
ee0c48b912 fixed bug due to deleting video capture device 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-17 14:13:02 +00:00
chrisparker126
c30318f0c0 Added initial implementation of get statistic functions 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7455 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-16 21:40:57 +00:00
thunder2
6dace62abe Fixed Windows compile of VOIP 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 21:12:10 +00:00
csoler
5df440b1bb bug fix in video sending 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7453 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 20:49:57 +00:00
csoler
01c467c4c0 added serialisation/transmission of video data 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 20:04:31 +00:00
csoler
9006c567a1 added method to add new widget in chatWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 15:59:12 +00:00
thunder2
d6408daafc Added new option to hide the tabbar with one open tab in forums and channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7450 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-14 21:29:51 +00:00
csoler
b6089f3b91 Started implementation of Video Chat (not working yet!). 
- GUI part is done
- implemented a very basic JPEG codec
- added echo frame in configuration panel
- created a video capture object that uses OpenCV (should be cross systems)
Remains to do:
- serialise and send frames through p3VoRS
- use a serious codec (e.g. Theora+x264)
- add icons to reflect camera state (failure/working/sending/...)
- compilation on windows 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-13 13:57:25 +00:00
csoler
3b88acb45d fixed up mismatched free/delete 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-13 08:58:58 +00:00
thunder2
383a035bdb - Added new translatable strings (patch from Henry) 
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-10 18:37:21 +00:00