defnax
|
46d4863b09
|
Merge branch 'master' of https://github.com/RetroShare/RetroShare
|
2016-08-04 19:50:00 +02:00 |
|
defnax
|
e2d29f6905
|
update icons
|
2016-08-04 19:46:20 +02:00 |
|
csoler
|
3993fbf5cc
|
fixed auto-positive opinions for contacts
|
2016-08-04 16:10:00 +02:00 |
|
csoler
|
c7576309a7
|
added callback in RsGenExchange subclasses to autorise new groups, to be used by p3GxsIdentity
|
2016-08-04 13:12:55 +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 |
|
csoler
|
70228ee405
|
fixed missign return, probably causing crashes
|
2016-08-04 11:02:12 +02:00 |
|
Cyril Soler
|
48b2e05e9a
|
Merge pull request #453 from G10h4ck/libresapilocal
ApiLocalConnectionHandler class quit() at the end outside if
|
2016-08-03 19:56:49 +02:00 |
|
csoler
|
c4ef4d7743
|
saved owner node ID in GXS reputation item
|
2016-08-03 14:52:37 +02:00 |
|
Gio
|
353308e2a5
|
ApiLocalConnectionHandler class quit() at the end outside if
|
2016-08-03 14:35:45 +02:00 |
|
Cyril Soler
|
60cf2991d4
|
Merge pull request #436 from G10h4ck/libresapilocal
Libresapilocal
|
2016-08-03 08:46:15 +02:00 |
|
Gio
|
e4e29c5adc
|
quit ApiLocalConnectionHandler after replying API query
|
2016-08-03 00:50:49 +02:00 |
|
csoler
|
17003f136b
|
modified wrong comment in why mLastPost should not be used in rsgxsnetservice.cc, and added a call to clearing GrpMeta cache when new msg in that group are received
|
2016-08-02 16:25:00 +02:00 |
|
csoler
|
3cd90ae11c
|
re-disabled the code to update the server TS to last post as it can severely perturbate the distribution of posts. Added a call to update msgServerUpdateMap when new messages received
|
2016-08-01 16:35:19 +02:00 |
|
csoler
|
d6be4404d2
|
re-enabled some code previously disabled in last commit
|
2016-08-01 15:38:51 +02:00 |
|
csoler
|
b1288bcb7e
|
added missing time stamp of msgServerUpdateMap when posting a new message
|
2016-08-01 14:43:17 +02:00 |
|
csoler
|
5fac5a8d76
|
moved all getOpenFilename to use misc::getOpenFilename
|
2016-07-31 22:15:56 +02:00 |
|
Cyril Soler
|
c643d1e672
|
Merge pull request #451 from PhenomRetroShare/Fix_ImportExportCertASC
Fix Import and Export Cert file *.asc.
|
2016-07-31 22:07:43 +02:00 |
|
Phenom
|
d000d75a38
|
Fix Import and Export Cert file *.asc.
|
2016-07-31 21:03:45 +02:00 |
|
Cyril Soler
|
edce1e953c
|
Merge pull request #449 from PhenomRetroShare/Add_RemoveDuplicateCBInRSCollEditor
Add Remove Duplicate checkbox in RsCollection editor.
|
2016-07-31 17:47:50 +02:00 |
|
Cyril Soler
|
6e25a30716
|
Merge pull request #450 from PhenomRetroShare/Fix_QFileDialogDontUseNativeDialog
Fix other QFileDialog call in misc adding DontUseNativeDialog option.
|
2016-07-31 17:21:12 +02:00 |
|
Phenom
|
6935441e4f
|
Fix other QFileDialog call in misc adding DontUseNativeDialog option.
|
2016-07-31 16:23:41 +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 |
|
mr-alice
|
538a11fd14
|
fixed compilation. Added missing functions, left blank
|
2016-07-31 15:59:58 +02:00 |
|
Cyril Soler
|
64b56092d3
|
Merge pull request #448 from PhenomRetroShare/Fix_IdDialogContextMenuShownAtStartUp
Fix IdDialog ContextMenu shown at startup.
|
2016-07-31 11:52:23 +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 |
|
Cyril Soler
|
372105570b
|
Merge pull request #447 from PhenomRetroShare/Fix_IdChooserInSignedLobby
Fix IdChooser in Signed Lobby.
|
2016-07-30 21:15:08 +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 |
|
Cyril Soler
|
2126234f47
|
Merge pull request #446 from PhenomRetroShare/Fix_FriendListSortGPGItem
Fix FriendList sorting when expand PGPItem sorted by LastContact or IP
|
2016-07-30 15:25:30 +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 |
|
Cyril Soler
|
b1dcd2ff08
|
Merge pull request #444 from PhenomRetroShare/Add_MergeFilterIdFilterToHeaderContextMenu
Merge Filter ComboBox to Header Context Menu in IdDialog.
|
2016-07-29 22:02:57 +02:00 |
|
csoler
|
1707c07937
|
added DontUseNativeDialog as default flag in file dialog in order to avoid some crashed when not using it
|
2016-07-29 21:58:59 +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
|
7c2e2bd503
|
take in account that QLocalSocket is of type STREAM so it doesn't emit readyRead event for each write() on the other side
|
2016-07-28 17:50:00 +02:00 |
|
Gio
|
fe7de83529
|
WebUI is now optional but enabled by default at compile time
|
2016-07-28 14:08:49 +02:00 |
|
mr-alice
|
aeb0595301
|
fixed updated ts in hash cache files
|
2016-07-28 10:49:49 +02:00 |
|
mr-alice
|
2aac88464d
|
fixed a few bugs in directory parsing
|
2016-07-28 09:29:15 +02:00 |
|
mr-alice
|
463f21c85c
|
fixed hashing thread
|
2016-07-28 00:48:28 +02:00 |
|
mr-alice
|
d86b89b15a
|
fixed compilation/running of directory updater
|
2016-07-27 21:22:59 +02:00 |
|
csoler
|
c73be934ed
|
removed anti-spam message that has become irrelevant
|
2016-07-26 16:06:03 +02:00 |
|
Cyril Soler
|
da8a520f3b
|
Merge pull request #442 from csoler/v0.6-ContactList
V0.6 contact list
|
2016-07-25 16:07:53 -04: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 |
|