11 Commits

Author	SHA1	Message	Date
defnax	c8dbe47d89	Update .gitignore	2018-12-23 18:59:34 +01:00
defnax	3d66d84112	fixed conflicts for pr 1438	2018-12-23 18:45:07 +01:00
Gio	10ec1144eb	Simplify QML to work better on both Desktop and Phone ... - Set request method to GET by default in ApiLocalConnectionHandler to avoid /peers request fail randomly - Use TabView instead of SwipeView to not depend on Qt 5.7.0 (latest version) - AddTrustedNode simplified layout to avoid unexpected behaviour on some phones - Locations add sslid property to root Item to avoid unexpected behaviour when multiple locations are available - TrustedNodesView color connected friends with green and offline with grey - Ignore kdevelop 4 files	2016-10-26 20:37:28 +02:00
Gio	ea42d822c2	Merge branch 'master' into android	2016-10-26 13:43:24 +02:00
mr-alice	ade6017f74	merged with upstream/master	2016-09-01 19:52:31 +02:00
Gio	85461825ce	Ignore all .pro.user files	2016-08-23 12:15:28 +02:00
mr-alice	63063102bb	fixed compilation of file lists code base	2016-07-20 16:10:51 -04:00
csoler	d089e2ef1a	added a GroupChooser class to choose groups of friend nodes	2016-07-09 18:06:59 -04:00
AsamK	622e94223c	Remove Thumbs.db files and add to .gitignore	2015-08-27 22:35:28 +02:00
csoler	fabc3a3985	added some rules to .gitignore	2015-08-05 20:53:18 +02:00
thunder2	1248cdc7d9	Added .gitignore	2015-08-02 01:27:17 +02:00