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,325 Commits 63 Branches 22 Tags 194 MiB
24a40fc665
Commit Graph

5325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
chrisparker126
8170697029 Decided again creating new Gxs dialogs. 
Decided on final form of GXS group create 
Added Post and Comment create
disabled wiki 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-07 23:24:23 +00:00
drbob
1b865612c5 * fixed up the display of PGP linked name etc. 
* made createIdentity work (plumbing)
 * disabled editId until GXS supports it.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-07 21:40:07 +00:00
drbob
0327b47ccc * Enabled pgphash background work. 
* Fixed lots of little bugs: ServiceString decoding, not saving to variables, etc.
 * Added createIdentity fns. - Can create Anon, but not PGPLinked ones yet? no idea why.
 * Added lots more debugging.
 * Added mutex protection for class variables.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-07 21:38:43 +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
drbob
aebd08f106 Fixed up the Id GUI to match new data types and use rsPeers for other info. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5783 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 19:18:56 +00:00
drbob
c09cab4439 * Added back idKnown, and pgpHash to rsIdentity Group type. (needed in GUI) 
* added in scheduling_tick() for coordinating background and pgphash ticks.
 * disabled Signatures until thread-safe version is present.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 19:18:11 +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
drbob
076e07d5d9 Disabled stuff - so it will compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-05 22:32:52 +00:00
drbob
17e42f1ceb Added core code for pgphash calculations. 
- Reworked GxsIdGroup members... moved IdType -> groupFlags, so Hash & Sign are only ones.
 - Reworked GroupServiceString storage.
 - Added core processing functions - yet to test!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-05 22:28:08 +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
defnax
e803b2c447 Changed to switch Start/Stop button text, when Slide is running or not. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-04 14:07:55 +00:00
chrisparker126
49096d29d2 - Added service_createGroup function which gives access to group keys and grpItem just before GXS group creation 
- Temp fix for GXS services hang on dummy data generation. Given each GXS service own thread and chunked grp creation (separate thread may need to be permanent, no obvious around move grp gen cost away from critical path of tick, but unscientifically increases each services thread tick period to reduce cpu cost)

- change grpId assignment from hash of grp data to admin keyid

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-04 01:38:48 +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
drbob
e42cc1123c Switched to RsMemCache for Key caching. 
- supports both private and public caching now.
 - bug fix in RsMemCache



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 14:07:26 +00:00
drbob
ffa8299718 * Fixed iterator bug in rsmemcache.h 
* Added rsmemcache.h to libretroshare.pro
 * initialised variables in p3idservice (was killing caching).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 13:15:21 +00:00
drbob
a074c40e6f adding basic caching functionality. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 12:41:11 +00:00
drbob
df1755316b * Fixed up Key Caching. 
* Added testing for Key Extraction.
 * Added Interface Fns for PrivateKey extraction.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 11:57:27 +00:00
chrisparker126
e0d332f564 added priority to nxs items (low, same as cache transfer items) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-03 00:02:50 +00:00
chrisparker126
6f6f55c166 Refactored signature creation to Gxs security 
Fixed signing of msgs 
Added signing of groups (follows p3distrib grp creation method)
Refactored GxsGroupDialog in 2 new UIs, GxsCreateGroupDialog and GxsViewGroup for ease of logic, retaining flexibility across GXS services. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 23:35:10 +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
drbob
563e3df91e Fixed up Identity requests. 
- The GUI now displays the dummy Ids (once they've had time to generate ;)
 - Generation from the GUI appears broken!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 00:49:06 +00:00
drbob
bd6b17a301 Improvements to Identity service. 
* Added Id & Wiki serialisers to constructors.
 * Enabled cache_tick()... thought it doesn't process anything yet.
 * Added debug to Id Key cache system.
 * Fixed requests to match expected params.
 * Added cachetest basics - this is not finished.
 * Enabled generation of Lots of Dummy Ids - This demonstrates some queuing issues.
 * Added #define to easily enable GxsId as only new service - for testing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-02 00:45:50 +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
thunder2
c46acc29de Fixed compile with Qt 4.7 and higher. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-01 09:51:22 +00:00
thunder2
afa3248429 Moved loadCertificate from main, StartDialog and GenCertDialog to Rshare. 
Switched StartDialog from QMainWindow to QDialog.
Updated english translation file.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-01 01:07:36 +00:00
drbob
99f2813bed Added Identity and Wiki GUIs to RS. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-01 00:19:02 +00:00
drbob
cfef2cc052 Modified Identity & Wiki GXS code so that it compiles. 
- Just commented out the issues - still needs to be converted to new system.
 - Included it in build
 - Not actually enabled in the GUI yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-31 23:32:56 +00:00
drbob
2fadb6d44d disabled debug msg 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-31 23:27:13 +00:00
drbob
92969c2f58 Improvements to GXS services. 
* Added serialiser for wiki items (actual data to be finalised).
 * Added wiki and fixed id services to be run properly.
 * Disabled dummyData for ids.
 * Fixed some bugs in Id serialiser.
 * Added missing fns in p3wiki



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-31 22:43:23 +00:00
defnax
f444869271 Added Fullscreen Button/functionality for PhotoDialog and PhotoSlideShow 
little design changes for the Comment Item, needs more improvements

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-30 17:10:19 +00:00
defnax
aadb408533 Added icons for the Channel TreeWidget 
Added placeholder text for Search Filter items on Group TreeWidget
Added placeholder text for Search Filter items in Messages Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-30 02:44:14 +00:00
defnax
bfe037e029 set LayoutVertikalSpacing to 1 for Channels Tree 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-30 01:14:40 +00:00
drbob
216683f747 got the wrong upnp library for windows. fixed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-30 00:15:57 +00:00