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
9,261 Commits 63 Branches 22 Tags 194 MiB
5fac5a8d76
Commit Graph

5056 Commits

Author SHA1 Message Date
Cyril Soler
656e7eb548 Merge pull request #415 from PhenomRetroShare/Add_BuildStatusInReadme.md 
Add Build Status in ReadMe.md file.
 2016-06-15 23:27:30 -04:00
defnax
da11995ca3 Clean up the Chat Toolbar Buttons 
Fixed display of Info Text on PGg details
 2016-06-15 23:32:01 +02:00
Phenom
631a29c701 Add Build Status in ReadMe.md file. 
And add AppVeyor File.
 2016-06-15 20:53:56 +02:00
Cyril Soler
ceecdb2771 Merge pull request #414 from PhenomRetroShare/Add_MessageWhenSendingArgToOtherInstance 
Add message, when sending arguments to other instance, to disable this
 2016-06-14 20:31:38 -04:00
Cyril Soler
cedce2ecef Merge pull request #260 from PhenomRetroShare/Add_SendAsPlainText_And_NoEmoteIcon_Button 
Add buttons to send message in plain text and without EmoteIcon.
 2016-06-14 20:30:06 -04:00
defnax
69e98b8e2d Added count Invited Members to Create Circles Dialog. 
Changed some context menu icons for People list and Circles tree.
Added icon when im Circle Admin.
 2016-06-15 00:08:45 +02:00
Phenom
ddbcd2150c Add buttons to send message in plain text and without EmoteIcon. 2016-06-14 23:01:08 +02:00
Phenom
9b09187340 Add message, when sending arguments to other instance, to disable this 
option.
 2016-06-14 16:49:18 +02:00
csoler
e03c5dfe56 improved GUI layout in circle creation box. Added tooltips 2016-06-13 22:38:51 -04:00
Cyril Soler
248d0c42d3 Merge pull request #412 from csoler/v0.6-MaxUpRate 
V0.6 max up rate
 2016-06-11 17:58:08 -04:00
Cyril Soler
eba90a83c6 Merge pull request #411 from PhenomRetroShare/Add_SIGFPE_Debug_DEFINES 
Add SIGFPE debug DEFINES.
 2016-06-11 09:24:33 -04:00
Phenom
d649659172 Add SIGFPE debug DEFINES. 
To allow debug SIGFPE easily.
Only need to uncomment DEFINES *= SIGFPE_DEBUG line in retroshare-
gui.pro.
 2016-06-11 14:38:31 +02:00
Phenom
08258ca8b8 Fix SIGFPE in QProgressBar::paintEvent 
When feenableexcept(FE_INVALID | FE_DIVBYZERO) is activated.
 2016-06-11 14:23:26 +02:00
defnax
d1be3f3a4f Set a minimum column width 2016-06-10 13:40:24 +02:00
csoler
83a143476e fixed bug in setting MaxRate values 2016-06-09 23:23:51 -04:00
csoler
f5ad8b49be moved node-wide options to node details 2016-06-09 23:13:07 -04:00
csoler
a4931edee0 fixed setting/getting maxrates using pgp id 2016-06-09 20:51:09 -04:00
csoler
226e85c9ba added dropmenu entry in circles to allow admin to grant/deny membership 2016-06-08 21:00:26 -04:00
csoler
a1bbcd829d fixed a few small issues in new peer rates 2016-06-07 22:06:32 -04:00
csoler
20b6745f70 added GUI and storage for max up/dn rates per peer 2016-06-07 21:48:22 -04:00
csoler
54a0ca4678 added line in circle tooltip for visibility. Re-worked tooltip text a little bit 2016-06-05 15:49:33 -04:00
csoler
ee2559620b updated tooltip and names for self-restricted circles to "private" 2016-06-05 15:20:55 -04:00
csoler
195ad4ec8f use grey bullet as a placeholder for circles without pending operations 2016-06-05 15:20:55 -04:00
Cyril Soler
456b57b5c9 Merge pull request #205 from pztrn/master 
Make sure that version_detail.sh script always do 2 things
 2016-06-05 13:17:30 -04:00
csoler
f55b283887 second pass over compilation warnings 2016-06-05 11:05:52 -04:00
csoler
927f782bef pass over compiler warnings 2016-06-05 10:43:57 -04:00
csoler
2567feb971 fixed compilation broken by using deprecated Qt method 2016-06-05 09:54:26 -04:00
defnax
0eb4e9e5be - renamed label "restricted to group" to "restricted to circle" 
- changed icon
 2016-06-04 21:27:20 +02:00
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
d6ae71ebc8 removed pointer to QStringList in QHash, causing memory loss 2016-04-20 20:21:29 -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
5645e44f9c Change regular expression(s) for identifying hotlinks in feral text. 2016-04-19 11:32:56 -05: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
Phenom
718d6f9b19 Resize Chat Tool Bar Button for Hight DPI screen. 2016-04-13 20:26:36 +02:00
Phenom
42a2b37abb Move SearchBar to Tool Bar and remove Show/Hide action. 
As asked by Cyril in PR#346
 2016-04-13 19:21:18 +02:00
Phenom
c5873f3216 Move Chat notify button from search bar to tool bar. 
As search bar is hidden by default.
 2016-04-13 18:35:42 +02:00
csoler
d512c4a35a enabled new link type for posted (patch from Fanch) 2016-04-12 22:59:12 -04:00
Cyril Soler
cf746f160c fixed possible crash in GxsIdDetails 2016-04-12 10:06:01 -04:00
csoler
d5ed84ec9d allow one to change the contact author of a circle 2016-04-11 23:43:18 -04:00
csoler
8f9028dc52 fixed bug in GxsIdLabel due to not removign existing jobs for a given widget before setting it to a new ID 2016-04-11 23:30:42 -04:00
csoler
6b2de05e89 added channel admin and distribution method in channel summary page 2016-04-11 22:42:02 -04:00
csoler
4fe66d67ef removed Edit/New circles buttons, put them in context menu. Added header frame (needs a proper look) 2016-04-10 10:53:27 -04:00
Phenom
d727311dbc Fix Graphic Circles update. 2016-04-10 12:00:23 +02:00
csoler
3b45fd8389 create new item "My own identities" to store own ids in IdDialog 2016-04-09 17:50:46 -04:00
Phenom
08e5679019 Fix Allow Only One Instance 
If RS_GUI is started without arguments, it is started with a new
instance.
 2016-04-08 02:14:27 +02:00
Cyril Soler
c8cae4c33c Merge pull request #297 from PhenomRetroShare/Add_AllowOnlyOneIntanceAndPassArg 
Allow only one instance. If exists, pass to it arguments.
 2016-04-07 00:09:00 -04:00
Phenom
10bb542e83 Allow only one instance for useLocalServer option activated. If exists, 
pass to it arguments.

For now, only allow to pass RsCollection file and retroshare://
protocol.
 2016-04-06 22:04:53 +02:00
csoler
9217ec3c9d added circle distribution info in forum summary page 2016-04-04 21:36:37 -04:00
csoler
ff4c360e27 fixed display bug in bw statistics graph 2016-04-04 21:16:05 -04:00
csoler
d34b2e885a allow to change the author ID of a group during update. Set proper value in group author widget 2016-04-03 17:11:13 -04:00
csoler
9ced5175fe improved tooltips in people list 2016-04-02 16:54:30 -04:00
csoler
53dbc526a8 removed mention of null PGP ids in People 2016-04-02 16:50:22 -04:00
csoler
5bbaa1e8e5 added people settings page, removed debug output 2016-04-02 16:14:18 -04:00