11332 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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
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
csoler	16856ca3fd	fixed yml script for AppImage	2017-08-12 22:32:46 +02:00
Phenom	041447b2d7	Add "No to All" for RSLink Open message.	2017-08-12 15:16:07 +02:00
Phenom	6b2bc7d84b	Fix From text in Mail ... Missing lines in Change RetroShareLink creation methodes as static	2017-08-12 14:13:10 +02:00
Phenom	5a1c316fc6	Fix Travis MacOs Compilation	2017-08-12 11:49:33 +02:00
Phenom	55bb105462	Fix Relay Setting Layout Margin	2017-08-12 11:21:14 +02:00
csoler	03d675157f	fixed branching problem in makeSOurcePackage.sh	2017-08-11 19:33:23 +02:00
csoler	c3460c31c7	merged previsous revisions	2017-08-11 19:27:49 +02:00
csoler	b8a556aae2	added qt-svg as a dependency	2017-08-11 19:00:15 +02:00
csoler	c331f669fe	added appImage generation system	2017-08-11 11:07:59 +02:00
csoler	545bcde5ad	added info for building/packaging on debian stretch	2017-08-10 10:36:30 +02:00
thunder2	3ae85dbc6f	Fixed version number in rsversion.in	2017-08-06 14:10:23 +02:00
Gioacchino	529eabeca7	Merge pull request #986 from ngleb/fix-cpp-comment ... fix C++ comment to avoid compilation error (fix #983)	2017-08-06 11:47:57 +02:00
Gleb Nemshilov	b686771a38	fix C++ comment to avoid compilation error	2017-08-06 14:27:26 +07:00
thunder2	52dbd91f3b	Removed Windows specific hack to get commandline arguments.	2017-08-05 14:23:35 +02:00
thunder2	ee867683ff	Fixed name of executable for autostart in Windows Installer	2017-08-05 14:19:49 +02:00
csoler	3e25d96daa	fixed unix -> linux-* target in .pri, as qt4 doesnt seem to recognise unix	2017-08-04 21:38:44 +02:00
csoler	27ee9ca4a0	Merge pull request #982 from csoler/v0.6.3 ... updated version number	2017-08-03 22:55:27 +02:00
csoler	11832e34f8	updated version number	2017-08-03 22:51:40 +02:00
csoler	4e02c5f262	Merge pull request #979 from PhenomRetroShare/Fix_LobbyAutoSubscribe ... Fix Lobby auto-subscribe.	2017-08-03 21:29:52 +02:00
csoler	4b820a055c	Merge pull request #981 from csoler/v0.6.3 ... removed newline that comes with debug info	2017-08-03 21:08:54 +02:00
csoler	84b32f060e	removed newline that comes with debug info	2017-08-03 20:09:48 +02:00
Angela Mazzurco	c0f28f524f	Set transparent background color	2017-08-03 18:31:05 +02:00
Angela Mazzurco	785bd65c74	Add shadow to the toolbar	2017-08-03 18:27:16 +02:00
Angela Mazzurco	9f52ffb677	Increase toolbar size	2017-08-03 17:38:15 +02:00
Angela Mazzurco	c790a5bff4	Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-II	2017-08-03 16:48:47 +02:00
Angela Mazzurco	83f886075d	Merge branch 'qml_app_emoji_font' into GSoC2017-evaluation-II	2017-08-03 16:48:37 +02:00
Angela Mazzurco	d70293c071	Merge branch 'qml_app_notify_unread' into GSoC2017-evaluation-II	2017-08-03 16:48:27 +02:00
Angela Mazzurco	54c8e26fee	Set emoji font declaration global for all app	2017-08-02 18:10:22 +02:00