9706 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Kaminsky	9a9ea0af85	Merge branch 'master' into uploadsStorageManagerNPE	2018-01-05 13:11:30 +01:00
Tobias Kaminsky	026241a3af	Merge pull request #1906 from nextcloud/notificationManager ... Get notification manager if it does not exist	2018-01-05 13:11:17 +01:00
Tobias Kaminsky	7a997c0544	Merge branch 'master' into notificationManager	2018-01-05 11:39:33 +01:00
Tobias Kaminsky	419eb04dc3	Merge pull request #1912 from nextcloud/NotificationActivity ... Notification activity: account can be null	2018-01-05 11:38:57 +01:00
Tobias Kaminsky	38d6706ea6	Merge branch 'master' into NotificationActivity	2018-01-05 10:58:34 +01:00
Tobias Kaminsky	07eec991e8	Merge pull request #1905 from nextcloud/mFileNeverNull ... mFiles should be never null	2018-01-05 10:56:46 +01:00
Tobias Kaminsky	b7370297e7	Merge branch 'master' into mFileNeverNull	2018-01-05 10:41:26 +01:00
Tobias Kaminsky	6c8993e632	Merge pull request #1603 from nextcloud/screenshots ... Screenshots with fastlane screengrab	2018-01-05 10:39:50 +01:00
Tobias Kaminsky	0b22058db3	Merge branch 'master' into screenshots	2018-01-05 10:29:23 +01:00
Tobias Kaminsky	6e25b628b4	Merge pull request #1913 from nextcloud/ReceiveExternalFiles ... Receive external files	2018-01-05 10:29:05 +01:00
Tobias Kaminsky	b41962da42	Merge branch 'master' into screenshots	2018-01-05 09:15:10 +01:00
tobiasKaminsky	f8efb31a27	code formatting	2018-01-05 08:48:53 +01:00
tobiasKaminsky	8d6e32b43d	extraText can be null ... getWindow can be null action bar can be null getType() or getAction on intent can be null code enhancements	2018-01-05 08:48:53 +01:00
Nextcloud bot	cfa9bfe700	[tx-robot] updated from transifex	2018-01-05 01:41:24 +00:00
Tobias Kaminsky	6d026d30a8	daily dev 20180105	2018-01-05 00:49:19 +01:00
Mario Danic	8a865ee638	Fix 1911 ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-04 22:22:30 +01:00
Tobias Kaminsky	b4d6545971	Merge pull request #1915 from nextcloud/autoUploadWithoutPermission ... Auto upload without permission	2018-01-04 14:59:03 +01:00
Tobias Kaminsky	eb0028d2cf	Merge branch 'master' into autoUploadWithoutPermission	2018-01-04 12:18:46 +01:00
Nextcloud bot	a86c3bfa5b	[tx-robot] updated from transifex	2018-01-04 11:15:53 +00:00
Tobias Kaminsky	74ebcdb595	Merge pull request #1776 from nextcloud/fdroidMetadata ... Use new metadata locations for fdroid	2018-01-04 12:08:26 +01:00
tobiaskaminsky	8ab4a346e2	special language handling	2018-01-04 12:05:04 +01:00
tobiaskaminsky	f9b288e990	handling support if language does not exists	2018-01-04 11:58:24 +01:00
Tobias Kaminsky	0863719f46	Merge branch 'master' into fdroidMetadata	2018-01-04 10:52:39 +01:00
Tobias Kaminsky	d341b89eef	Update strings.xml	2018-01-04 10:39:41 +01:00
Nextcloud bot	7de5242a26	[tx-robot] updated from transifex	2018-01-04 01:33:44 +00:00
tobiasKaminsky	37ce53db5c	minor code cleanup	2018-01-03 10:12:10 +01:00
tobiasKaminsky	a6474c32aa	make auto upload safe with no storage permission	2018-01-03 10:06:17 +01:00
tobiasKaminsky	c3a0a38db1	account possible can be null	2018-01-03 08:38:54 +01:00
tobiasKaminsky	d5f0aa7db1	account possible can be null	2018-01-03 08:35:32 +01:00
Nextcloud bot	ec246eac59	[tx-robot] updated from transifex	2018-01-03 01:31:19 +00:00
tobiasKaminsky	576fb79f67	get notification manager if it does not exist	2018-01-02 15:05:51 +01:00
tobiasKaminsky	b4b2500b75	mFiles is never null	2018-01-02 13:07:33 +01:00
tobiaskaminsky	7d8633a0bc	prevent NPE	2018-01-02 11:51:03 +01:00
Tobias Kaminsky	8cf83f0a02	Update ScreenshotsIT.java ... new line	2018-01-02 09:37:37 +01:00
Tobias Kaminsky	84fd893363	Update Screengrabfile ... new line	2018-01-02 09:37:37 +01:00
tobiasKaminsky	0a577b9fd6	fix lint	2018-01-02 09:37:37 +01:00
tobiasKaminsky	f6c7ccfedc	add mocked devices for phone and tablet	2018-01-02 09:37:37 +01:00
tobiasKaminsky	ba18ef206f	add davdroid screenshot ... add translation	2018-01-02 09:37:31 +01:00
tobiaskaminsky	5b754ae51d	fix things due to CR and codacy	2018-01-02 09:37:21 +01:00
tobiaskaminsky	36253ccec2	Screenshots with fastlane screengrab	2018-01-02 09:37:20 +01:00
Nextcloud bot	ad6509bdb5	[tx-robot] updated from transifex	2018-01-02 07:40:51 +00:00
Nextcloud bot	6f27269f47	[tx-robot] updated from transifex	2018-01-02 01:31:44 +00:00
Nextcloud bot	deada3f594	[tx-robot] updated from transifex	2018-01-01 01:31:26 +00:00
Nextcloud bot	df15f85cfe	[tx-robot] updated from transifex	2017-12-31 01:32:03 +00:00
Nextcloud bot	e5f8ef7df0	[tx-robot] updated from transifex	2017-12-30 01:32:33 +00:00
Tobias Kaminsky	736abe3770	daily dev 20171230	2017-12-30 00:55:36 +01:00
tobiasKaminsky	0d9386a52d	rebas	2017-12-29 08:58:52 +01:00
tobiasKaminsky	163e6c08c2	changed versionDev	2017-12-29 08:57:07 +01:00
tobiasKaminsky	40c30357b5	replace "\n" from transifex/strings.xml with real linespace for fastlane/fdroid	2017-12-29 08:57:07 +01:00
tobiasKaminsky	c4a238fef6	resolve merge conflicts	2017-12-29 08:57:07 +01:00