9760 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Kaminsky	1853deb143	Merge pull request #2078 from nextcloud/correctE2Ename ... Store info that file is encrypted	2018-01-31 09:08:53 +01:00
tobiasKaminsky	b0a1152a75	store info that file is encrypted ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-31 08:47:50 +01:00
Tobias Kaminsky	d1c53093cc	Merge pull request #2068 from nextcloud/snackbarOnlyIfActivityExists ... show download snackbar only if activity exists	2018-01-31 08:10:32 +01:00
Tobias Kaminsky	44bef145a2	Merge pull request #2066 from nextcloud/fix-autoupload-2 ... Fix auto restart of pending Auto Upload entries	2018-01-31 07:37:17 +01:00
tobiaskaminsky	d9435fcf1d	show download snackbar only if activity exists ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-31 07:35:41 +01:00
Nextcloud bot	09337e9cea	[tx-robot] updated from transifex	2018-01-31 01:39:53 +00:00
Tobias Kaminsky	6dc5815276	daily dev 20180131	2018-01-31 00:55:05 +01:00
Tobias Kaminsky	9512f425b3	Merge branch 'master' of github.com:/nextcloud/android	2018-01-31 00:30:36 +01:00
Mario Đanić	737ce03e51	Merge pull request #2067 from nextcloud/hardenExternalStorage ... getExternalFilesDir(null) can be null --> preventing NPE	2018-01-30 19:26:05 +01:00
Mario Đanić	f4670cf602	Merge pull request #2071 from nextcloud/e2eFlagOnlyOnFolders ... E2e flag only on folders	2018-01-30 19:24:22 +01:00
Mario Đanić	2f071c2a5f	Merge pull request #2074 from nextcloud/bugfix/2070 ... Fixes #2070: Move the responsibility of FAB's theming to theris owner	2018-01-30 19:23:50 +01:00
Bartosz Przybylski	2e8c417ed7	Fixes #2070: Move the responsibility of FAB's theming to theris owner ... Since ExtendedListFragment is owning all FAB's where is no need for any other activity to alter the theming of those buttons. ThemeUtils are wide accessible, and at the time of construction, so apply the theming there.	2018-01-30 17:12:02 +01:00
tobiaskaminsky	3ae0610b7a	add default values ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-30 13:20:13 +01:00
tobiaskaminsky	c1a2221b88	e2e flag only on folder ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-30 13:14:34 +01:00
tobiaskaminsky	f080bdb70e	getExternalFilesDir(null) an be null --> preventing NPE ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-30 08:37:15 +01:00
Nextcloud bot	dcb82998f8	[tx-robot] updated from transifex	2018-01-30 01:41:11 +00:00
Tobias Kaminsky	1edd87fcc8	daily dev 20180130	2018-01-30 01:14:30 +01:00
Mario Danic	6bb9636dcb	Just a test ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 20:55:33 +01:00
Andy Scherzinger	dbba847001	Merge pull request #2064 from nextcloud/fixE2EuserID ... Use fetched userID	2018-01-29 20:42:02 +01:00
tobiasKaminsky	601138099a	bump version ... fix webpage -> website Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-29 16:50:02 +01:00
tobiaskaminsky	91f624524d	use fetched userID ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-29 16:50:02 +01:00
Mario Đanić	8bf7aa24bf	Merge pull request #2062 from nextcloud/fix-for-autoupload ... Fix for autoupload	2018-01-29 16:48:53 +01:00
Mario Danic	30dd629364	Check internetSet all arguments as nullable ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 10:29:31 +01:00
Tobias Kaminsky	9d89d0554e	Update UploadsStorageManager.java ... line wrap	2018-01-29 10:28:04 +01:00
Mario Danic	18ad2d858b	Fix up request ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 10:18:10 +01:00
Mario Đanić	1028bb351d	Merge pull request #2052 from nextcloud/tintDeleteDialog ... Tint delete account dialog buttons	2018-01-29 09:15:51 +01:00
Mario Danic	4880e783bf	Fix ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 09:12:56 +01:00
Andy Scherzinger	29e4a8aa43	Merge pull request #2057 from nextcloud/fix-2043 ... Update dependencies	2018-01-29 09:11:51 +01:00
Mario Danic	0feaa84149	Fix auto uploads ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 09:11:41 +01:00
Mario Danic	676d7d5d31	Update dependencies ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-29 08:57:07 +01:00
Tobias Kaminsky	19ca990db8	Merge pull request #2058 from nextcloud/fix-issues-with-services ... Fix crashing issue on bootup	2018-01-29 08:54:51 +01:00
Tobias Kaminsky	435bf4256c	Merge pull request #2059 from nextcloud/update-android-job ... Update android job	2018-01-29 08:54:25 +01:00
Tobias Kaminsky	74b9872ffd	Merge pull request #2060 from nextcloud/fix-2041 ... Fix 2041	2018-01-29 08:54:01 +01:00
Nextcloud bot	13e36cc59a	[tx-robot] updated from transifex	2018-01-29 01:42:10 +00:00
Mario Danic	098c4aacbf	Fix 2041 ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-28 21:46:34 +01:00
Mario Danic	091eb0b9d0	Update android job ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-28 21:32:13 +01:00
Mario Danic	bedf9f1ae8	Fix crashing issue on bootup ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-28 21:28:13 +01:00
Mario Đanić	af0a31d957	Merge pull request #2054 from nextcloud/handlePNG ... handlePNG generates not noly square images	2018-01-28 20:47:35 +01:00
Mario Đanić	a1813fa11e	Merge pull request #2053 from nextcloud/welcomeScreen ... Initial welcome screen: centered and no bullet points	2018-01-28 20:47:08 +01:00
Nextcloud bot	dd2c02e46a	[tx-robot] updated from transifex	2018-01-28 01:39:29 +00:00
tobiasKaminsky	9d30e6cae1	handlePNG generates not noly square images ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-27 09:16:21 +01:00
tobiasKaminsky	6ce793ed16	Initial welcome screen: centered and no bullet points ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-27 08:55:59 +01:00
tobiasKaminsky	6f6423d276	Tint delete account dialog buttons ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-27 08:42:40 +01:00
Nextcloud bot	e4cf4455f6	[tx-robot] updated from transifex	2018-01-27 01:39:40 +00:00
Tobias Kaminsky	8b4848cccd	daily dev 20180127	2018-01-27 01:04:58 +01:00
Andy Scherzinger	f1471fffe9	Merge pull request #2048 from nextcloud/renameFolder ... Fix renaming folder	2018-01-26 18:23:09 +01:00
tobiaskaminsky	9ab98e95a2	fix renaming folder ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-26 13:36:14 +01:00
Nextcloud bot	1fd1f38faf	[tx-robot] updated from transifex	2018-01-26 06:39:46 +00:00
Nextcloud bot	5f64b6bc1b	[tx-robot] updated from transifex	2018-01-26 01:39:46 +00:00
Tobias Kaminsky	608621bb80	daily dev 20180126	2018-01-26 01:05:32 +01:00