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
7,011 Commits 63 Branches 22 Tags 194 MiB
030c69d95b
Commit Graph

4147 Commits

Author SHA1 Message Date
csoler
030c69d95b restored some code removed by mistakein 7904 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-07 09:53:33 +00:00
csoler
e6d92bf44e separated "owned by you" and "linked to your node" which are two different things; fixed bug showing chat menu for own identity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 20:37:24 +00:00
csoler
6620269f31 fixed typo in column addressing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 20:28:50 +00:00
csoler
9dcb3b2555 removed unused code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 19:53:22 +00:00
defnax
f3715a1257 Fixed Scale QLabel content 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 15:55:19 +00:00
defnax
8a87e2503d set item icon size 22x for Identity icons. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 11:51:08 +00:00
thunder2
5dd26de35b Used AvatarDialog to choose an avatar for an identity. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-05 00:10:37 +00:00
defnax
b0a8eba546 fixed compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 23:36:37 +00:00
csoler
5ae5d4f0a1 added avatar to GxsId tooltip (see in forums). Removed thread data race due to multiple threads accessing the static data member image_cache, causing avatars to not show up randomly. I do not have a clean solution yet on how to restore this cache 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 23:05:56 +00:00
csoler
52901c1ddb removed unused code in ServicePermissionPage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 20:38:02 +00:00
thunder2
6cad38bd7c Fixed deadlock in RSGraphWidget (Patch from Cyril) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-04 10:56:19 +00:00
defnax
0ebc1223b3 Set Light gray background color for the identicons for better look n feel. 
Fixed to scale QLabel content.
Moved to display Avatars on ID Dialog into a QLabel

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 22:16:21 +00:00
csoler
7642ba1c1f added load/save to service permission matrix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 21:28:32 +00:00
defnax
96bf79daae Added Avatar Dialog at the moment for own peerid, soon for gxs avatars change. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-03 19:17:35 +00:00
csoler
64f8b4c539 removed all permission system. Kept the use-as-direct-source option. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 22:32:30 +00:00
csoler
a018f17af7 switch to standard identity icon format for defautl icons (patch from Phenom, slightly modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 21:59:44 +00:00
csoler
8e8860d1bd fixed design of PermissionMatrix. Improved scroller. Fixed bug not showing permissions correctly. Added help text. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 21:42:41 +00:00
defnax
88c6af3b74 Enabled to display extern gxs Avatars on ID Details Dialog 
Moved remove button under the add btn,for better look.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-02 00:47:49 +00:00
csoler
63a3051d3c added global switch on/off per service 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 20:34:30 +00:00
csoler
2a9551a41a added auto-update to permission matrix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 15:08:18 +00:00
csoler
b2c2b7fc85 implemented dedicated widget for service permission matrix. Permissions are not saved yet, and we also need a default switch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-02-01 14:38:19 +00:00
thunder2
c04693faba Removed "Send" button in CreateGxsForumMsg and used "Ok" button of the buttonbox to send a message. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-31 12:23:56 +00:00
thunder2
9a9ea9b55a Fixed icon to toggle participants frame in chat dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-31 11:23:09 +00:00
thunder2
7cfd50f860 Fixed another crash in IdEditDialog::createId when avatar is not set. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-29 17:51:25 +00:00
thunder2
4cab5dc743 Fixed crash in IdEditDialog::updateId when no avater is set. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-29 16:09:32 +00:00
thunder2
b7f4e292f1 Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7885 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-29 14:43:31 +00:00
defnax
6be1cb82b9 Added remove Avatar functionality 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7882 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-27 16:36:27 +00:00
defnax
d2d0b2ae61 Added own Avatar Label on Person Details 
Fixed layout.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-26 23:37:27 +00:00
csoler
a94465fd3a allow to change own avatar for already existing identity. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7879 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-26 19:56:32 +00:00
defnax
3a64bc2601 Added Button for Set Avatar, added border stylesheet for the Avatar label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-26 16:50:01 +00:00
csoler
481ee246b5 added avatars to identities. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 22:09:12 +00:00
defnax
b321953789 revert context menu changes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 14:14:03 +00:00
thunder2
f02948c54c Removed timeout of waiting tokens in TokenQueue (gui) and increased timeout of requests in libretroshare from 30 seconds to 2 minutes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 12:29:33 +00:00
defnax
7c850aaa02 changed dialog to none blocking mode 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 12:24:10 +00:00
defnax
4a4ea80110 Added Person details dialog, for popup mode view. 
changed from setEnabled to setVisible, to not show up the disabled actions for Own Ids. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-24 19:27:19 +00:00
thunder2
eff55b2591 Fixed removing of a node in friends list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-24 00:59:32 +00:00
csoler
34f968a112 merged new GRouter model (branch v0.6-NewGRouterModel 7837-7863). Provides a fully functional distant messaging system. The asynchronous part will be implemented shortly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 19:28:10 +00:00
defnax
0e3cd003ad Fixed reply Author on forums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 17:43:29 +00:00
defnax
483934100a clean up security feed item 
Added Send Message context menu action for Identities List

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 16:35:06 +00:00
csoler
5967ee535f fixed free/delete mess in GRouter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 15:16:04 +00:00
defnax
b155c36170 renaming strings and changed icons for Network/People 
added Peer def for Identities.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 14:42:28 +00:00
defnax
e5203e1f6a rename string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7861 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 13:24:08 +00:00
csoler
e0308eacd2 fixed up cache loading issues on get key. Polished grouter stats. Improved sending logic. Distant msgs now work 100% (sync-ed) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-23 12:13:13 +00:00
thunder2
8600b39384 Show size of attached files in MessageWidget with friendly unit. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-22 22:54:41 +00:00
csoler
1998ddd765 fixed gui bits. Improved message handlign logic and notification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-22 14:33:19 +00:00
thunder2
32c9fe7eca Moved checkbox for news feed sort order from settings to NewsFeed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-20 18:06:56 +00:00
defnax
8006484242 Set Combobox Right to Left 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-15 16:09:01 +00:00
thunder2
94ec83fcdb Removed version files from retroshare-gui. 
Moved header file with version information to retroshare/rsversion.h.
Added version information to Windows executable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-14 23:26:51 +00:00
thunder2
7f58460e5f Added DEPENDPATH to pro files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 23:14:35 +00:00
csoler
8cb3ae6d2e added code to generate 3072 and 4096 bit PGP keys at startup (Patch from Serhaf) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 22:02:43 +00:00