7585 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Đanić	c2edec6815	Merge pull request #1021 from nextcloud/brandingDrawer ... Drawer branding	2017-05-24 00:56:44 +02:00
Mario Đanić	f5e1660769	Merge pull request #1020 from nextcloud/showContactBackup ... Contacts backup folder after new install	2017-05-24 00:56:02 +02:00
tobiaskaminsky	977e2fb691	logging via LOG_OC ... removed unnedded try catch	2017-05-24 00:55:48 +02:00
tobiaskaminsky	778829d69c	- always update contacts backup folder ... - if file is not downloaded, download it then show content	2017-05-24 00:55:48 +02:00
Mario Đanić	a5329a6aa7	Merge pull request #1019 from nextcloud/npeInContactBackups ... NPE in contact backups	2017-05-24 00:54:28 +02:00
tobiaskaminsky	315ac57a32	fix license comment	2017-05-24 00:53:58 +02:00
tobiaskaminsky	523c5c5a41	fix license comment	2017-05-24 00:53:58 +02:00
tobiaskaminsky	4460c2135c	npe if expiring backups after fresh install	2017-05-24 00:53:58 +02:00
Mario Đanić	6a46fc984c	Merge pull request #1016 from nextcloud/storeLintOutput ... Store lint output in nextcloud	2017-05-24 00:53:05 +02:00
tobiaskaminsky	306d0db533	fixed relative paths	2017-05-24 00:52:41 +02:00
tobiaskaminsky	6bc48fdb34	store lint output in nextcloud	2017-05-24 00:52:41 +02:00
Mario Đanić	febd1435de	Merge pull request #995 from nextcloud/crashDueToEmptyString ... Crash due to non-existing empty string	2017-05-24 00:15:14 +02:00
Mario Đanić	474314b2dc	Merge pull request #985 from nextcloud/audioRotationBug ... Re-use second fragment if available	2017-05-24 00:14:15 +02:00
Mario Đanić	55f346a1ad	Merge pull request #1010 from nextcloud/codacy ... Further codacy fixes	2017-05-24 00:10:02 +02:00
AndyScherzinger	766a691a19	A switch statement does not contain a break (codacy)	2017-05-24 00:01:54 +02:00
AndyScherzinger	0fa8df201d	A switch statement does not contain a break (codacy)	2017-05-24 00:01:54 +02:00
AndyScherzinger	a14401a2e4	extract ContentValue object creation to private methods	2017-05-24 00:01:53 +02:00
AndyScherzinger	03a81d902d	An instanceof check is being performed on the caught exception. Create a separate catch clause for this exception type. (codacy)	2017-05-24 00:01:53 +02:00
AndyScherzinger	b44320076b	Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes (codacy)	2017-05-24 00:01:53 +02:00
AndyScherzinger	e29ca8091d	Use one line for each declaration, it enhances code readability (codacy)	2017-05-24 00:01:52 +02:00
AndyScherzinger	2f6793f878	remove unnecessary return statement (codacy)	2017-05-24 00:01:52 +02:00
Mario Đanić	b89ee5219a	Merge pull request #1035 from nextcloud/fix143DroneBuild ... align app version code/name throughout builds (1.4.3)	2017-05-23 23:55:03 +02:00
tobiasKaminsky	1cede628f9	bump version	2017-05-23 23:47:51 +02:00
AndyScherzinger	15339b665a	align app version code/name throughout builds (1.4.3)	2017-05-23 23:47:51 +02:00
Nextcloud bot	0ae25b0c2c	[tx-robot] updated from transifex	2017-05-23 06:55:56 +00:00
Nextcloud bot	00f4e595fa	[tx-robot] updated from transifex	2017-05-23 00:26:22 +00:00
Tobias Kaminsky	670a78468b	Merge pull request #1033 from nextcloud/release143 ... Bump version 1.4.3	2017-05-22 17:24:40 +02:00
tobiasKaminsky	0627dd2a84	bump version	2017-05-22 17:21:37 +02:00
Tobias Kaminsky	58b0592d44	Merge pull request #1032 from nextcloud/nc12auth ... HOTFIX: Ignore oauth for now and use always basic auth	2017-05-22 17:14:48 +02:00
tobiasKaminsky	d17af1d37e	ignore oauth for now and use always basic auth	2017-05-22 17:09:05 +02:00
tobiaskaminsky	ce57d257b1	Merge remote-tracking branch 'remotes/origin/master' into brandingDrawer2	2017-05-22 10:03:15 +02:00
tobiaskaminsky	1f8ee72aa5	set to 757575ff and no transparence as in othere files	2017-05-22 10:02:08 +02:00
tobiaskaminsky	16cfaa5525	change/add nav_videos res	2017-05-22 09:49:58 +02:00
Nextcloud bot	9bc5d1bde7	[tx-robot] updated from transifex	2017-05-22 00:25:50 +00:00
Nextcloud bot	ae373a0693	[tx-robot] updated from transifex	2017-05-21 00:25:37 +00:00
Nextcloud bot	50889f726b	[tx-robot] updated from transifex	2017-05-20 00:24:46 +00:00
Andy Scherzinger	c33a88104d	Merge pull request #1024 from nextcloud/contactsSort ... Sort contact list	2017-05-19 14:50:15 +02:00
tobiasKaminsky	32a5c7d81a	formatting	2017-05-19 07:47:00 +02:00
Nextcloud bot	4ed4ed8dc0	[tx-robot] updated from transifex	2017-05-19 00:25:56 +00:00
alejandro	f94169a458	Sort contacts list	2017-05-18 18:50:21 -05:00
Tobias Kaminsky	332d48abac	Merge branch 'master' into crashDueToEmptyString	2017-05-18 16:16:45 +02:00
Tobias Kaminsky	a08d17b592	Merge pull request #1014 from nextcloud/improve-push ... Improve push	2017-05-18 15:04:56 +02:00
nextcloud-android-bot	b43dc9d1a7	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-18 12:50:27 +00:00
Tobias Kaminsky	4898ee1050	Merge 2d78364f70 into 547453760e	2017-05-18 12:36:12 +00:00
tobiaskaminsky	2d78364f70	Warning "Duplicated icons under different names" increased, but no other way possible	2017-05-18 14:35:57 +02:00
tobiaskaminsky	7eddd7440c	fixed "all files"	2017-05-18 14:34:44 +02:00
nextcloud-android-bot	17beb10fdd	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-18 11:15:26 +00:00
Tobias Kaminsky	98989a9363	Merge 44b9355315 into 547453760e	2017-05-18 10:52:31 +00:00
tobiaskaminsky	44b9355315	change to value of current master	2017-05-18 12:52:20 +02:00
tobiaskaminsky	da497abdb6	move/copy drawer icons	2017-05-18 12:20:55 +02:00