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,730 Commits 63 Branches 22 Tags 194 MiB
7aaf3306f0
Commit Graph

4492 Commits

Author SHA1 Message Date
Phenom
accd3ca734 Fix RsTextBrowser::loadRessource on Windows. 
When current style use images (like bubble).
 2016-08-15 20:02:01 +02:00
Phenom
dd2e4c32d5 Change Image Blocked Icon On RSTextBrowser 2016-08-15 20:01:14 +02:00
Phenom
df44f50f86 Add Banned Filter in IdDialog. 2016-08-15 19:59:52 +02:00
defnax
b0b4320c0b decrease chat bar widget icon size 2016-08-13 16:20:58 +02:00
Phenom
fcad9d99ab Fix RSTextBrowser::loadResource if image comes from stylesheet. 2016-08-13 10:42:42 +02:00
Phenom
f71aad4b9c Add Chat Load Embedded Images Option like forum and message. 2016-08-13 09:46:31 +02:00
defnax
0e1c0c2eb3 Added search filter for participants list. 2016-08-12 22:19:44 +02:00
defnax
1fe7dce424 Set icons for the voting combo box 2016-08-10 00:22:23 +02:00
Phenom
8a5c07b5e2 Copy RsTreeWidget Header ContextMenu to Item ContextMenu. 2016-08-09 21:01:00 +02:00
defnax
d1645e97bd moved auto-ban checkbox to a better position 2016-08-09 19:38:56 +02:00
Cyril Soler
aaf13eb4dd Merge pull request #466 from PhenomRetroShare/Fix_RsCollEditorCountUpdateWhenRemove 
Fix RsCollection Editor Count Update When Removing items.
 2016-08-09 10:47:08 +02:00
Phenom
275c47eff9 Add Title when ask for password. 2016-08-09 01:22:14 +02:00
Phenom
6edd7bb8e3 Add possibility to create GXSId directly on GenCertDialog. 2016-08-08 22:57:06 +02:00
Cyril Soler
c2c88939fe Merge pull request #462 from PhenomRetroShare/Add_CaseSensitiveOptionForLobbyNotify 
Add Case Sensitive option for Lobby Notify.
 2016-08-08 22:18:32 +02:00
Cyril Soler
0b1f08a1ce Merge pull request #461 from PhenomRetroShare/Add_CommentNumberOnButton 
Add Comment Number On Button.
 2016-08-08 22:12:55 +02:00
Cyril Soler
723d96bcd1 Merge pull request #460 from PhenomRetroShare/Fix_LobbyNotifyIcon 
Fix Lobby Notify Icon.
 2016-08-08 22:11:10 +02:00
Phenom
ee368ef045 Fix RsCollection Editor Count Update When Removing items. 
Thanks to Jola to get this bug.
 2016-08-08 20:45:43 +02:00
Phenom
88407e6d30 Fix Image Block on RSTextBrowser. 2016-08-07 19:41:44 +02:00
Phenom
d0482707c5 Add Case Sensitive option for Lobby Notify. 2016-08-07 19:00:23 +02:00
Phenom
ea6bbac732 Add Comment Number On Button. 2016-08-07 14:40:04 +02:00
defnax
dea776a61a Moved font menu to Settings menu 2016-08-06 18:35:07 +02:00
Phenom
776e404c2b Fix Lobby Notify Icon. 
But now this not report which type of lobby is.
 2016-08-06 17:52:12 +02:00
Cyril Soler
9f14103c1c Merge pull request #458 from PhenomRetroShare/Fix_QMessageBoxAddWidget 
Fix QMessageBox layout addWidget.
 2016-08-06 15:47:23 +02:00
Phenom
21bd8cd6df Fix QMessageBox layout addWidget. 2016-08-06 13:49:53 +02:00
Phenom
beab81e134 Fix Forum Item sort on LastPost View. 
msg.mMeta.mChildTs Was not updated when received new child so do it when
creating GxsIdRSTreeWidgetItem.
 2016-08-06 11:57:41 +02:00
defnax
f3d1a6c1ec Added missed notify icon 2016-08-05 19:13:59 +02:00
defnax
ac73fd92a7 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-08-05 01:01:56 +02:00
defnax
e2bb477899 Added new blue icon set for Chat Widget (icons by Beluga) svg ad png Format 2016-08-05 01:00:53 +02:00
csoler
7545ad4d11 simplied/improved reputation system. Now ids can be banned based on their owner node using a single checkbox in the Person tab, with immediate effect 2016-08-04 11:43:35 +02:00
Cyril Soler
60cf2991d4 Merge pull request #436 from G10h4ck/libresapilocal 
Libresapilocal
 2016-08-03 08:46:15 +02:00
csoler
5fac5a8d76 moved all getOpenFilename to use misc::getOpenFilename 2016-07-31 22:15:56 +02:00
Phenom
d000d75a38 Fix Import and Export Cert file *.asc. 2016-07-31 21:03:45 +02:00
Phenom
03179043f1 Add Remove Duplicate checkbox in RsCollection editor. 
If unchecked, you can add the same file (same hash) in multiple
directories.
 2016-07-31 16:08:15 +02:00
Phenom
998fede7e7 Fix IdDialog ContextMenu shown at startup. 2016-07-31 11:15:47 +02:00
mr-alice
5b9fd74d85 removed most of CacheStrapper stuff from ftServer, replaced fimonitor by p3FileDatabase 2016-07-30 21:52:42 +02:00
Phenom
bef7db4b4d Fix IdChooser in Signed Lobby. 
So you cannot choose an unsigned Id.
 2016-07-30 19:14:59 +02:00
Cyril Soler
2921d9eac2 Merge pull request #445 from PhenomRetroShare/Add_MergeDisplayMenuToHeaderContextMenu 
Move Display button's menu to Header context menu on FriendList.
 2016-07-30 15:26:27 +02:00
Phenom
46e4b3b4c8 Fix FriendList sorting when expand PGPItem sorted by LastContact or IP 2016-07-30 13:58:02 +02:00
Phenom
ae9ab644a9 Move Display button's menu to Header context menu on FriendList. 2016-07-30 13:27:23 +02:00
defnax
d62f8a49f1 Fixed stylesheet 2016-07-29 23:21:46 +02:00
defnax
032bcf7a26 Fixed Stylesheets 2016-07-29 23:14:46 +02:00
Phenom
d3beccf3e2 Merge Filter ComboBox to Header Context Menu in IdDialog. 2016-07-29 21:39:58 +02:00
defnax
431dd68509 Temporary solution for the Filter Combobox it takes to much space, no space more for search filter,moved under the ToolBar. 2016-07-29 17:29:54 +02:00
Gio
fe7de83529 WebUI is now optional but enabled by default at compile time 2016-07-28 14:08:49 +02:00
csoler
c73be934ed removed anti-spam message that has become irrelevant 2016-07-26 16:06:03 +02:00
csoler
ed05ec7008 fixed text in People tab 2016-07-25 16:06:28 -04:00
csoler
f5e55e849b fixed a few bugs in the People tab 2016-07-25 16:04:30 -04:00
csoler
218977170c added two new options to people page for handlign reputations: change the ban limit from friend opinions, and allow to auto-set positive opinions to contacts 2016-07-25 15:45:49 -04:00
csoler
efd503e7d4 removed the possibility of GXS groups to keep track of post origin before release, as it is too intrusive as compared to the benefits 2016-07-25 14:56:55 -04:00
Phenom
7c7da7e6d1 Fix Posted Feed Item when received comment. 2016-07-23 01:48:35 +02:00
csoler
95edc5ba8e fixed variable name problem in ServerPage (with no consequences) 2016-07-22 10:06:24 -04:00
Gio
b5f95cb651 libresapilocal is now optional (enabled by default) 2016-07-15 11:25:31 +02:00
Gio
47414acb62 Basic support to access libresapi via unix socket / windows named pipes 2016-07-15 11:25:31 +02:00
csoler
c555300c37 fixed merging with upstream 2016-07-12 22:45:23 -04:00
csoler
931c3df282 fixed display of group node restriction in GxsGroupDialog and info 2016-07-11 21:33:09 -04:00
csoler
45b189c080 removed EXTERNAL/PERSONNAL options from GxsCircleChooser 2016-07-11 18:30:12 -04:00
csoler
d089e2ef1a added a GroupChooser class to choose groups of friend nodes 2016-07-09 18:06:59 -04:00
csoler
a69629cf73 added missing own id from group list, and removed possible duplicates in random group ids 2016-07-06 22:16:05 -04:00
csoler
269f9457be fixed load/save of new group ids and backward compatibility with FriendList 2016-07-06 22:02:56 -04:00
csoler
01c0d2f0f1 finished conversion to RsNodeGroupId for file transfer and GUI 2016-07-05 23:49:43 -04:00
Cyril Soler
1c277ab81b Merge pull request #433 from csoler/v0.6-SqlCache 
V0.6 sql cache
 2016-07-05 23:47:55 -04:00
csoler
42f221075a removed debug info in IdDialog 2016-07-03 23:15:05 -04:00
csoler
09ad53981d fixed red color in IdDialog 2016-07-03 22:02:23 -04:00
csoler
692293e030 added red color to banned identities in IdDialog 2016-07-03 18:12:50 -04:00
csoler
e611b2bb05 moved isIdentitybanned from p3GxsReputations to p3IdService, so as to avoid calling back p3IdService from p3GxsReputations, which simplifies the code 2016-07-03 18:06:01 -04:00
csoler
0206c652df added missing else in display of forum anti-spam message 2016-06-30 15:06:41 -04:00
csoler
ba500284c7 added GXS distribution flag to defavor posts signed by key form unknown RS nodes, and updated UI in forums to use it 2016-06-30 14:16:45 -04:00
Phenom
456751a83c Fix ProgressBar Chunk with Standard.qss 2016-06-28 20:23:32 +02:00
Phenom
e6347d7aef Fix "!!!The RetroShare's desktop file is missing or wrong!!!" message 
for Linux.
 2016-06-25 11:09:28 +02:00
csoler
07bda26192 fixed permission matrix widget crash 2016-06-18 16:27:15 -04:00
Phenom
d84fdff2e1 Fix GxsChannelPostItem when received comment. 2016-06-18 20:10:14 +02:00
Cyril Soler
7627bd96ca Merge pull request #417 from csoler/v0.6-SecurityKeys 
V0.6 security keys
 2016-06-17 22:53:05 -04:00
csoler
eb05922cd1 added a tooltip and read color for unsecure GXS identities. These are still supported for a few weeks at most. So get rid of them 2016-06-17 22:21:06 -04:00
csoler
cc6ae747cb fixed color of admin circles (we cannot use a bullet, since bullets are kept for Membership property) 2016-06-16 23:17:56 -04:00
csoler
4d452bf6eb removed annoying warning in avatar widget 2016-06-16 23:17:56 -04:00
csoler
b9ba51f2ba improved naming of publish/admin rights in GroupTreeWidget 2016-06-16 22:23:27 -04:00
csoler
dbd78d2401 merged with upstream/master 2016-06-16 20:19:03 -04:00
defnax
70662cf8bf Fixed some layout spacing 2016-06-16 18:41:56 +02: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
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
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
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
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