csoler
24f619d62b
added missing include for debian squeeze
2016-06-04 03:20:45 +02:00
csoler
d8189d08f7
moved placeholder text from .ui to .cpp to allow compilation with old Qt
2016-06-03 21:14:34 -04:00
defnax
4300d87b3d
Set default Header Stylesheet for Circles
2016-06-03 19:15:24 +02:00
sehraf
6e38554bcd
rename define UBUNTU to HAS_GNOME_KEYRING
...
The name UBUNTU is misleading since it is only used to select the keyring backend (which is gnome keyring on linux).
This also allows to support other keyrings on linux in the future (e.g. KDEs keyring)
2016-06-02 14:57:46 +02:00
csoler
cbef01451c
added regular test of circle auto-subscribe from cache, and auto-subscribe when submitting a membership request
2016-05-29 16:09:56 -04:00
csoler
2bde81f210
removed more debug info, improved tooltips
2016-05-28 21:09:44 -04:00
csoler
ccd72cb827
removed some debug info. Added information tooltips on circles and ids in circle member/invitee list
2016-05-28 20:58:28 -04:00
csoler
8b5e43f2b0
remove subitems in circles member list when they are gone from cache
2016-05-28 17:18:25 -04:00
Cyril Soler
dafb2e6bc2
Merge pull request #396 from csoler/v0.6-Circles
...
V0.6 circles
2016-05-27 17:35:23 -04:00
csoler
74b4d6667a
added ifdef to allow to remove the sorting of circles into member/not member. To be tested for final decision
2016-05-26 21:16:21 -04:00
csoler
ae5929e9ad
fixed possible crash due to using a deleted item
2016-05-26 18:58:48 -04:00
csoler
a32bcbae0a
changed Members to Invited members in circle creation dialog
2016-05-25 21:17:09 -04:00
csoler
d1f4e134a5
removed display of circle members in left ID list
2016-05-25 19:04:45 -04:00
csoler
cfeed5c171
fixed column width and titles in circles
2016-05-25 18:47:06 -04:00
csoler
605763d812
added all IDs in circle to display tree
2016-05-25 18:34:12 -04:00
csoler
219dd01958
improved GUI display in circle list
2016-05-25 17:51:23 -04:00
csoler
5b69fa06fd
fixed re-draw of subitem in circle tree when flags changed
2016-05-24 21:23:35 -04:00
csoler
5bc83d902b
fixed unsubscription of external circles
2016-05-23 21:09:06 -04:00
csoler
55cb15caa9
fixed updating of membership when loading circle cache entry
2016-05-22 20:35:51 -04:00
csoler
68e618ba4c
fixed GUI for circle invites
2016-05-22 18:21:48 -04:00
csoler
d60e99e8e0
added subwidgets for invited GXS ids in circles
2016-05-21 16:50:50 -04:00
csoler
722609a3e6
finished implementing the backend part for the subscription system
2016-05-18 21:13:54 -04:00
Phenom
a2a058211c
Change Open existing file link from Question to Warning.
2016-05-16 17:42:39 +02:00
Phenom
1f8f413c85
Fix RsCollectionFile::load(QString, bool) calls.
...
Remove "this" as bool parameter.
2016-05-16 11:32:17 +02:00
csoler
9e182414c1
fixed wrong signal connection
2016-05-14 11:48:23 -04:00
csoler
aa80ffd5e6
fixed GUI for invitation handling menus
2016-05-14 11:13:54 -04:00
csoler
a3a0b1d312
added proper menus for adding/removing IDs from circles
2016-05-12 22:30:12 -04:00
csoler
d01c61fde8
added items for encoding subscription requests and the logic to create them from GUI calls
2016-05-11 17:59:42 -04:00
csoler
9a86989060
first version of circle messages
2016-05-10 21:24:31 -04:00
csoler
c9846c0dcf
added proper context menu for requesting/cancelling circle subscription
2016-05-06 22:12:44 -04:00
csoler
83049259f2
added bullets to show subscription status of circles. Enabled message sync in circles. Changed flags in GxsCirclesDetails to include new subscription flags
2016-05-06 21:37:17 -04:00
csoler
70648398e2
merged with upstream/master
2016-05-01 15:22:13 -04:00
Nyfor
5e94c772b3
Fixed compilation for Clang.
2016-04-23 09:50:49 +02:00
csoler
d696f72533
fixed compilation
2016-04-22 20:38:07 -04:00
csoler
acd059bdf0
removed potential memory leak in TransfersDialog
2016-04-22 18:49:42 -04:00
csoler
52cf66a536
fixed memory leak in SubscribeToolButton menu
2016-04-22 17:55:15 -04:00
Cyril Soler
3fae108cb1
removed div by zero in transfers dialog
2016-04-21 12:59:07 -04:00
csoler
a35a60849a
renamed subscribed circle item into belongingCircle item which is more appropriate
2016-04-19 22:00:32 -04:00
Chuck Rhode aka Manuel Davis
8be53dd79a
Improve inserting placemark in ChatLobby.
...
*append* inserts text at end but with formatting in effect at
current cursor position, such as in the middle of a hotlink,
which would be strange. This OTOH inserts text with
formatting in effect on the last line, which may be strange
or not.
2016-04-19 11:11:58 -05:00
csoler
d44efc7b68
added some info in circles
2016-04-17 18:05:31 -04:00
csoler
34bd998c8e
cleaned the mess in Circles, due to mixing up GxsIds and PgpIds, which is now irrelevant because items for external circles are not sent based on PGP signatures anymore
2016-04-17 17:13:42 -04:00
csoler
c14c240f07
fixed update of circles GUI using a timer. This is not optimal, and should be replaced by a proper notify call
2016-04-17 00:52:01 -04:00
csoler
3000f94999
separated subscribe status from wether we are part of a circle or not. Still needs update of GUI
2016-04-17 00:52:00 -04:00
defnax
2552b556eb
Merge branch 'master' of https://github.com/RetroShare/RetroShare
2016-04-15 20:32:00 +02:00
defnax
85942f43c3
improving the create circle layout
2016-04-15 20:30:32 +02:00
csoler
048192ee9c
added mOriginator to CircleCache entry and auto-ask for unknown GXS ids to the friend who supplied the circle group
2016-04-14 23:47:42 -04:00
csoler
971f8e0c12
fixed potential crash due to not updating mPendingDataIterator after deleting map entry
2016-04-13 18:41:49 -04:00
Cyril Soler
92eb9c5113
Merge pull request #346 from PhenomRetroShare/Move_ChatNotifyButtonToToolBar
...
Move Chat notify button from search bar to tool bar.
2016-04-13 18:15:56 -04:00
defnax
aad295dafb
Fixed layout margin
2016-04-13 21:00:07 +02:00
Phenom
45f77def2b
Change Lobby Send button tooltip.
2016-04-13 20:42:12 +02:00