11360 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
csoler	762d0258ed	Merge pull request #1027 from PhenomRetroShare/Fix_UninitializedPeerMaxRates ... Fix Uninitilized Peer Max Rates.	2017-09-12 17:40:54 +02:00
Phenom	8884a324bb	Fix Uninitilized Peer Max Rates. ... When called by /libretroshare/src/pqi/pqihandler.cc:140	2017-09-12 17:18:41 +02:00
csoler	66bf1884a8	Merge pull request #1029 from PhenomRetroShare/Fix_UninitValueInLocalDirUpd ... Fix unitialized value in LocalDirectoryUpdater.	2017-09-11 22:20:27 +02:00
Phenom	cf908674ce	Fix unitialized value in LocalDirectoryUpdater.	2017-09-11 21:51:14 +02:00
csoler	3b7809a408	Merge pull request #1028 from csoler/v0.6-FT ... added default ignore list on linux	2017-09-11 20:49:11 +02:00
csoler	551ef63c6e	added default ignore list on linux	2017-09-11 19:36:06 +02:00
csoler	c5f91e3b6b	Merge pull request #1026 from csoler/v0.6-FT ... V0.6 ft	2017-09-11 19:05:19 +02:00
csoler	0ca0b72a5a	moved file ignore test to a more appropriate place	2017-09-11 19:02:07 +02:00
csoler	eff5c5d6ee	added pause to file hashing	2017-09-10 22:07:36 +02:00
csoler	ea25d4b5a4	improved update of ignore list	2017-09-10 20:22:17 +02:00
csoler	884b3a6220	added infrastructure to add a ignore list in shared files	2017-09-10 19:58:57 +02:00
csoler	b3e1597d6b	Merge pull request #1025 from Ppjet6/master ... Typo in GenCertDialog	2017-09-09 18:34:25 +02:00
Maxime Buquet	c85664e6e4	Typo in GenCertDialog	2017-09-09 13:54:30 +01:00
csoler	1e2a2275f4	Merge pull request #1023 from Ppjet6/master ... Typo in GenCertDialog	2017-09-09 14:48:35 +02:00
csoler	1bc9ef6f62	Merge pull request #1022 from PhenomRetroShare/Fix_MoveSharedFilesDialog ... Move SharedFilesDialog to /gui/FileTransfer/	2017-09-09 14:48:02 +02:00
Maxime Buquet	64d0290e44	Typo in GenCertDialog	2017-09-09 03:48:18 +01:00
Phenom	4336a4ad46	Move SharedFilesDialog to /gui/FileTransfer/ ... And remove old DEFINE because very olds files are deleted.	2017-09-07 19:53:51 +02:00
csoler	54ee6509d1	Merge pull request #1021 from PhenomRetroShare/Fix_ProgressSorting ... Fix File Transfert Progress Sorting.	2017-09-07 18:54:04 +02:00
Phenom	d81f9a351e	Fix File Transfert Progress Sorting.	2017-09-07 18:16:07 +02:00
csoler	1dc6bef985	Merge pull request #1019 from PhenomRetroShare/Add_GroupedUpLoadItem ... Regroup Upload Items by file in TransfersDialog.	2017-09-07 18:08:34 +02:00
Phenom	3b4e84c6d4	Regroup Upload Items by file in TransfersDialog.	2017-09-07 17:08:05 +02:00
csoler	f9102e5964	Merge pull request #1001 from PhenomRetroShare/Add_OnlyHiddenNodeCF ... Add Only Hidden Node configure flag	2017-09-05 20:59:16 +02:00
csoler	9ceba80fcb	Merge pull request #1015 from PhenomRetroShare/Fix_TravisCI_MacOS ... Fix Travis CI build for MacOS	2017-09-05 20:46:33 +02:00
csoler	671b418c81	Merge pull request #1008 from PhenomRetroShare/Add_FilterInDownloadList ... Add a filter to DownLoad list	2017-09-05 20:46:05 +02:00
Phenom	32888f0819	Fix Travis CI build for MacOS ... OpenCV move from homebrew/science/ to trunk.	2017-09-05 16:19:10 +02:00
csoler	bc6ea65d75	Merge pull request #1000 from PhenomRetroShare/Fix_RemovePngPng ... Remove *.png.png duplicated Files	2017-09-04 16:52:59 +02:00
csoler	c6ffe07cd1	Merge pull request #1009 from csoler/v0.6-FT ... V0.6 ft	2017-09-04 16:48:17 +02:00
csoler	160ab7b4f3	added missing code for remote search by hash, fixing the bug of direct sources not added	2017-09-03 23:32:48 +02:00
csoler	8d146038c2	fixed bug preventing search by hash to be called on own files	2017-09-03 22:52:31 +02:00
csoler	063783a859	Merge pull request #1004 from digitigrafo/master ... Orange skin webUI proposed	2017-09-03 14:59:14 +02:00
Phenom	a73ea437ed	Add a filter to DownLoad list	2017-09-02 17:57:04 +02:00
cri	e1e1fb4189	revert build orange skin	2017-08-24 15:31:17 +02:00
cri	4fc91be217	rwd style	2017-08-24 15:08:29 +02:00
cri	d845a3e55a	orange css skin >48em	2017-08-24 14:32:22 +02:00
Your Name	ea4495fcbe	added new orange skin	2017-08-23 11:16:26 +02:00
csoler	7f8386f91d	Merge pull request #998 from myfingerhurt/master ... add new keys to WebUI api peers handling	2017-08-20 21:17:19 +02:00
Phenom	5d59d56ba2	Add Only Hidden Node configure flag ... To have only hidden node generation append the following assignation to qmake command line "CONFIG+=rs_onlyhiddennode"	2017-08-20 13:17:28 +02:00
Phenom	cb7cfb440a	Remove *.png.png duplicated Files	2017-08-19 23:55:39 +02:00
ben	130099f43e	add new keys for WebUI api peers handling, distinguishable hidden node and clear node when examining certificate	2017-08-18 16:27:30 +09:00
Gioacchino Mazzurco	32f43b999e	Merge branch 'GSoC2017-evaluation-final'	2017-08-18 01:39:31 +02:00
csoler	106f03d42b	Merge pull request #993 from PhenomRetroShare/Fix_OpenMessageForAllFile ... Add "No to All" for RSLink Open message.	2017-08-16 22:26:48 +02:00
csoler	526d8e7b52	Merge pull request #990 from PhenomRetroShare/Fix_RelaySettingLayoutMargin ... Fix Relay Setting Layout Margin	2017-08-16 22:26:13 +02:00
csoler	06158a9937	Merge pull request #992 from PhenomRetroShare/Fix_MailFromText ... Fix From text in Mail	2017-08-16 22:25:41 +02:00
csoler	291bddb52b	Merge pull request #995 from PhenomRetroShare/Fix_AppVeyor ... Fix AppVeyor build by disabling SQLCipher	2017-08-16 22:24:17 +02:00
csoler	2a0b9eea48	Merge pull request #991 from PhenomRetroShare/Fix_TravisMacCompil ... Fix Travis MacOs Compilation	2017-08-16 22:23:15 +02:00
Angela Mazzurco	79f09f14ac	Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-final	2017-08-16 14:09:38 +02:00
Angela Mazzurco	18f7733a80	Merge branch 'qml_app_face_generator' into GSoC2017-evaluation-final	2017-08-16 14:09:26 +02:00
Phenom	73a6fee2ea	Fix AppVeyor build by disabling SQLCipher	2017-08-13 14:34:43 +02:00
Angela Mazzurco	a87c31f2dc	Fix canvas face displaced down	2017-08-13 13:05:01 +02:00
Angela Mazzurco	5a1a84fc5d	Refactor use better variable names	2017-08-13 13:02:49 +02:00