5698 commits

Author	SHA1	Message	Date
AndyScherzinger	28e8eaa376	fix DB upgrade routine for virtual table	2017-05-12 13:21:03 +02:00
tobiasKaminsky	854a3c026c	added privacy webview ... restructured setup.xml adapted modified/setup.xml to general/setup.xml	2017-05-12 12:43:36 +02:00
AndyScherzinger	9a88f547f4	Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles	2017-05-12 11:01:30 +02:00
tobiasKaminsky	c341c8d204	workaround: do nothing if sharee already exists	2017-05-12 10:54:50 +02:00
tobiasKaminsky	c4331a10fa	re-use second fragment if available	2017-05-12 08:47:01 +02:00
Nextcloud bot	8ec2a1de46	[tx-robot] updated from transifex	2017-05-12 00:22:16 +00:00
Mario Đanić	2d94a9898c	Merge pull request #977 from nextcloud/enable-folder-favorite-action ... Add support for folder favorite action	2017-05-11 11:53:16 +02:00
Mario Danic	4e122a9124	Fix issues ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-11 11:50:46 +02:00
Mario Đanić	192e4d6213	Merge pull request #928 from nextcloud/fix_bug_previewmedia ... Fix bug #888	2017-05-11 11:40:57 +02:00
tobiasKaminsky	39bf45da64	revert this, although it will get removed by a different PR	2017-05-11 11:36:41 +02:00
Mario Đanić	99114a2c72	Merge pull request #972 from nextcloud/hideContactsBackupFolder ... Hide contacts backup folder	2017-05-11 11:32:15 +02:00
tobiaskaminsky	399ff5802f	get storage manager, stop if null (this happens while a long async thread, e.g. photo fetching, is cancelled by device orientation changing)	2017-05-11 09:13:42 +02:00
klemens	f30cbca78c	spelling fixes	2017-05-10 21:04:47 +02:00
Mario Danic	d3ea3a8ccf	Add support for folder favorite action ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-10 19:54:40 +02:00
Nextcloud bot	db7e5fae89	[tx-robot] updated from transifex	2017-05-10 00:24:22 +00:00
alejandro	e101785ce2	Show hidden files after enable it	2017-05-09 17:44:12 -05:00
alejandro	28dfecc6d9	Fix Issue #970	2017-05-09 17:43:00 -05:00
Mario Đanić	378fd9b8df	Merge pull request #960 from nextcloud/preventUsingDestroyedActivity ... prevent using destroyed activity	2017-05-09 14:01:28 +02:00
Nextcloud bot	e7fa4d24e5	[tx-robot] updated from transifex	2017-05-09 00:22:33 +00:00
Nextcloud bot	5dc5863af3	[tx-robot] updated from transifex	2017-05-08 00:21:53 +00:00
tobiasKaminsky	b1f60cb63b	re-use fragments if they exist	2017-05-07 10:08:25 +02:00
Nextcloud bot	db660e12d5	[tx-robot] updated from transifex	2017-05-07 00:21:47 +00:00
tobiasKaminsky	b8197ee993	prevent using destroyed activity	2017-05-06 12:25:05 +02:00
Nextcloud bot	ada1d9e9ab	[tx-robot] updated from transifex	2017-05-06 00:21:25 +00:00
tobiasKaminsky	2589471e98	show share type	2017-05-05 16:00:46 +02:00
tobiasKaminsky	74ab6cf154	Merge branch 'searchViewWrongFiles' of https://github.com/nextcloud/android into testSearch2	2017-05-05 14:43:06 +02:00
tobiasKaminsky	3735cec70c	prevent restoring latest fragment when rotating	2017-05-05 14:42:08 +02:00
tobiasKaminsky	5a60a5a531	fix swipe to refresh	2017-05-05 09:18:56 +02:00
tobiasKaminsky	62818760c1	Merge remote-tracking branch 'origin/searchViewWrongFiles' into searchViewWrongFiles ... # Conflicts: # src/main/java/com/owncloud/android/providers/FileContentProvider.java	2017-05-05 09:10:16 +02:00
Nextcloud bot	2705f3e116	[tx-robot] updated from transifex	2017-05-05 00:21:30 +00:00
tobiasKaminsky	9211578a55	allow clicking on folder in favorites/search	2017-05-04 23:13:39 +02:00
tobiasKaminsky	e8023989bb	if search is empty, show file list	2017-05-04 23:13:39 +02:00
tobiasKaminsky	6c24bb2c7d	removed empty if	2017-05-04 23:13:39 +02:00
tobiasKaminsky	3f7263d532	enable FAB only if not on searchView	2017-05-04 23:13:39 +02:00
tobiasKaminsky	5e1bd31c58	make file search working again	2017-05-04 23:13:39 +02:00
tobiasKaminsky	c7fa90a3b8	revert check for specific fragment while search, as contactBackup does not have a search	2017-05-04 23:13:39 +02:00
tobiasKaminsky	33ed0626ff	speedup search	2017-05-04 23:13:39 +02:00
tobiasKaminsky	6c2d881dfe	- search view shows data again ... - no crash while rotation during search view is populated	2017-05-04 23:13:39 +02:00
tobiasKaminsky	0dc569bc94	sort order by creation date	2017-05-04 23:13:39 +02:00
tobiasKaminsky	ac8b0b30bb	fix for #857	2017-05-04 23:13:39 +02:00
Tobias Kaminsky	12ae31601a	Merge pull request #950 from nextcloud/codacyCleanUps ... further codacy clean ups	2017-05-04 15:53:29 +02:00
Tobias Kaminsky	d1a68cc834	Merge pull request #947 from nextcloud/externalStorage ... Enhance external Sdcard usage	2017-05-04 15:51:03 +02:00
tobiasKaminsky	47921b3f6b	allow clicking on folder in favorites/search	2017-05-04 15:49:46 +02:00
tobiasKaminsky	61069fc4e1	if search is empty, show file list	2017-05-04 15:39:06 +02:00
Mario Đanić	413147018f	Merge pull request #951 from nextcloud/contactBackupReturn ... ContactList: handle back press correct	2017-05-04 14:54:50 +02:00
Mario Đanić	9fb6b1ca37	Merge pull request #952 from nextcloud/wrongTitle ... show correct title when switching to "on device"	2017-05-04 14:53:48 +02:00
tobiasKaminsky	27db51727e	Merge remote-tracking branch 'remotes/origin/master' into searchViewWrongFiles	2017-05-04 14:43:50 +02:00
tobiasKaminsky	9544b79197	removed empty if	2017-05-04 14:37:02 +02:00
tobiasKaminsky	89bc1552b9	Merge remote-tracking branch 'origin/externalStorage' into externalStorage2	2017-05-04 14:29:54 +02:00
tobiasKaminsky	4ee600f3aa	check if writable	2017-05-04 14:29:46 +02:00
tobiasKaminsky	9d7a831114	show correct title when switching to "on device"	2017-05-04 14:18:32 +02:00
tobiasKaminsky	64fad91842	handle back press correct	2017-05-04 13:36:23 +02:00
AndyScherzinger	01d28bbdbc	Codacy: simplify if statement(s)	2017-05-04 12:36:17 +02:00
AndyScherzinger	5c9419db90	Codacy: Position literals first in String comparisons	2017-05-04 12:32:43 +02:00
AndyScherzinger	e85f1592e2	codacy: Use one line for each declaration, it enhances code readability.	2017-05-04 12:30:03 +02:00
AndyScherzinger	0592eac9bf	codacy: put fields on top; they should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.	2017-05-04 12:19:50 +02:00
Tobias Kaminsky	54eba4142a	Merge pull request #949 from nextcloud/fix-crash-on-login ... Delete all accounts on first run	2017-05-04 11:17:08 +02:00
tobiasKaminsky	be4fb43fb4	extract strings, use title	2017-05-04 11:12:14 +02:00
Nextcloud bot	8a9ff494e2	[tx-robot] updated from transifex	2017-05-04 09:04:46 +00:00
Nextcloud bot	9cf326d44e	[tx-robot] updated from transifex	2017-05-04 08:47:51 +00:00
Nextcloud bot	bfa1f060c0	[tx-robot] updated from transifex	2017-05-04 00:21:28 +00:00
Mario Đanić	4524acfa2d	Merge pull request #945 from nextcloud/FileDetailSearchIcon ... hide search icon on FileDetailFragment	2017-05-03 23:23:41 +02:00
Mario Danic	107f80afaa	Delete all accounts on first run ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-03 22:40:22 +02:00
tobiasKaminsky	8ccff56370	if source folder does not exist, still allow to move to new folder	2017-05-03 17:21:02 +02:00
tobiasKaminsky	e68e8f6d32	- use externalMediaDir to allow downloaded files to be scanned again ... - do not show "unknown" storage path, instead show complete path	2017-05-03 16:07:52 +02:00
tobiasKaminsky	2e517f7b33	hide search icon on FileDetailFragment	2017-05-03 14:03:23 +02:00
tobiasKaminsky	b6b8dc1040	enable FAB only if not on searchView	2017-05-03 13:55:27 +02:00
Andy Scherzinger	292b4bf83e	Merge pull request #944 from nextcloud/fix-autoupload-after-acc-delete ... Fix an auto upload still occurring after acc delete	2017-05-03 13:53:28 +02:00
tobiasKaminsky	277704e89f	make file search working again	2017-05-03 13:43:50 +02:00
tobiasKaminsky	e40fd02d72	Merge remote-tracking branch 'remotes/origin/master' into searchViewWrongFiles	2017-05-03 13:38:23 +02:00
tobiasKaminsky	a304f1b0a0	revert check for specific fragment while search, as contactBackup does not have a search	2017-05-03 13:35:22 +02:00
tobiasKaminsky	9f7cd59682	speedup search	2017-05-03 13:14:30 +02:00
Mario Danic	ff3dcb8910	Cancel all auto upload jobs	2017-05-03 12:05:18 +02:00
Mario Đanić	e55f06ec6e	Merge pull request #941 from nextcloud/suppressLint ... remove suppressLint	2017-05-03 11:56:14 +02:00
Mario Danic	3786d46cf3	Simplify code	2017-05-03 11:50:59 +02:00
Mario Danic	ed1f05173d	Fix an issue	2017-05-03 11:49:20 +02:00
tobiasKaminsky	c6268a609a	remove suppressLint ... Checkerboard on PNG files is only shown in >= M and thus toggle Background is also used in >= M only	2017-05-03 08:52:25 +02:00
Mario Danic	12f53eaf85	Fix fab stuff	2017-05-03 06:14:34 +02:00
Mario Đanić	e058de967c	Merge pull request #926 from nextcloud/rotationBug ... do not create a new adapter while rotating	2017-05-03 06:05:58 +02:00
Mario Đanić	fd67ec912d	Merge pull request #927 from nextcloud/preventCrashOnFingerprint ... prevent crashing if fingerprint is not supported	2017-05-03 05:39:07 +02:00
Mario Đanić	8f5eb1d662	Merge pull request #933 from nextcloud/push-improvements ... Fix stuff	2017-05-03 05:31:21 +02:00
Mario Danic	9186839048	Fix stuff	2017-05-03 05:30:37 +02:00
Mario Đanić	8e7fe636b7	Merge pull request #921 from nextcloud/activityOrientationChangeNPE ... NPE during Activity orientation change	2017-05-03 05:22:40 +02:00
Mario Đanić	7eade9c6dc	Merge pull request #916 from nextcloud/push-improvements ... Push improvements	2017-05-03 05:22:09 +02:00
Mario Danic	c1eeea1dcb	Change name as requested	2017-05-03 05:21:17 +02:00
Nextcloud bot	1246675b0e	[tx-robot] updated from transifex	2017-05-03 00:21:39 +00:00
alejandro	39433884e8	This code was removed because canceled the filter task	2017-05-02 11:56:16 -05:00
alejandro	9ebb7b582d	Issue #888 was fixed	2017-05-02 11:42:48 -05:00
tobiasKaminsky	7a117ce1f7	prevent crashing if fingerprint is not supported	2017-05-02 16:49:39 +02:00
Mario Danic	1effc4d23e	Fix build	2017-05-02 14:15:36 +02:00
Mario Danic	7f1739f5f7	Improve push / remove push registration	2017-05-02 13:53:19 +02:00
tobiasKaminsky	19c031f722	do not create a new adapter while rotating	2017-05-02 12:18:06 +02:00
tobiasKaminsky	9f7ccae575	do the same for Notification	2017-05-02 09:41:04 +02:00
Nextcloud bot	c9a53cb042	[tx-robot] updated from transifex	2017-05-02 06:46:46 +00:00
Nextcloud bot	d77b446e0d	[tx-robot] updated from transifex	2017-05-02 00:21:53 +00:00
Nextcloud bot	e44a5d690c	[tx-robot] updated from transifex	2017-05-01 00:21:49 +00:00
Mario Đanić	f07c78221d	Merge pull request #874 from nextcloud/contacts-fragment-replace ... Contacts backup improvements/bugfixes	2017-04-30 19:47:50 +02:00
Mario Danic	a7eab02d08	Fix codacy stuff	2017-04-30 19:40:27 +02:00
Mario Đanić	6a6f5d9ca1	Merge pull request #918 from nextcloud/autoUploadKeepInFolder ... AutoUpload: default to "keep file in original folder"	2017-04-30 19:35:29 +02:00
tobiasKaminsky	13ddc01467	NPE during Activity orientation change	2017-04-30 13:02:31 +02:00
tobiasKaminsky	f9b6417f48	- search view shows data again ... - no crash while rotation during search view is populated	2017-04-30 12:14:39 +02:00
Nextcloud bot	a8230f03c9	[tx-robot] updated from transifex	2017-04-30 00:21:24 +00:00
Tobias Kaminsky	f1e113753b	Merge pull request #915 from nextcloud/privatereese-patch-1 ... "And" Missing	2017-04-29 09:08:17 +02:00
tobiasKaminsky	21c4551c45	default to "keep file in original folder"	2017-04-29 08:21:50 +02:00
Nextcloud bot	7b1f251a0d	[tx-robot] updated from transifex	2017-04-29 00:21:08 +00:00
Mario Đanić	e9dc702dfc	Merge pull request #904 from nextcloud/customErrorWebView ... ability to show custom error message for webview	2017-04-28 22:59:07 +02:00
Bernhard Blieninger	299a71e03f	I think the "and" is missing.	2017-04-28 22:38:31 +02:00
Mario Danic	87cb2890ad	Cancel job only for an account	2017-04-28 20:51:47 +02:00
alejandro	887645921f	Fixing duplicated code	2017-04-28 10:22:47 -05:00
tobiasKaminsky	c9c2cdbb4e	add Arbitrary Data table ... use it for multiple account contact backup	2017-04-28 14:52:30 +02:00
tobiasKaminsky	935e795a85	Merge remote-tracking branch 'remotes/origin/contacts-fragment-replace' into contactBackupRestore	2017-04-28 14:12:46 +02:00
tobiasKaminsky	21418cdc2d	Merge remote-tracking branch 'origin/master' into contactBackupRestore	2017-04-28 14:09:32 +02:00
tobiasKaminsky	aca5040a80	add Arbitrary Data table	2017-04-28 14:09:23 +02:00
tobiasKaminsky	f1dc6fb89c	sort order by creation date	2017-04-28 11:48:00 +02:00
tobiasKaminsky	478370c4dd	fix for #857	2017-04-28 11:48:00 +02:00
Andy Scherzinger	957670eb97	Merge pull request #906 from nextcloud/manageAccountNPE ... prevent NPE if quotaLink does not exist, e.g. in manageaccount activity	2017-04-28 11:25:02 +02:00
Mario Danic	1cd175a1e5	Fix bugs	2017-04-28 10:39:59 +02:00
tobiasKaminsky	02411467b8	cancel specific backup job ... disable daily backup on remove	2017-04-28 10:39:59 +02:00
tobiasKaminsky	7fc6d5fb6d	deleted not needed xml stuff	2017-04-28 10:39:58 +02:00
AndyScherzinger	4dae921763	change style of import button	2017-04-28 10:39:58 +02:00
tobiasKaminsky	06d87d7a11	add select/deselect all button	2017-04-28 10:39:57 +02:00
Mario Danic	3522d28fbf	Fix all issues	2017-04-28 10:39:57 +02:00
Mario Danic	cb00d3f422	Fix enable automatic job	2017-04-28 10:39:56 +02:00
Mario Danic	fc2f762bb2	Fix restore appearance	2017-04-28 10:39:56 +02:00
AndyScherzinger	85846e154f	revert bottom_toolbar_enabled to false	2017-04-28 10:39:56 +02:00
AndyScherzinger	841ad6c348	minor code review fixes	2017-04-28 10:39:55 +02:00
AndyScherzinger	097b05d59a	fixes after rebase	2017-04-28 10:39:55 +02:00
AndyScherzinger	7a5409f0e8	extract listener to class	2017-04-28 10:39:55 +02:00
AndyScherzinger	8d46e8b9d2	remove/re-add for proper win support...	2017-04-28 10:39:54 +02:00
AndyScherzinger	7afe91914f	remove/re-add for proper win support...	2017-04-28 10:39:54 +02:00
Mario Danic	e89e290c87	Take more time to pop	2017-04-28 10:39:53 +02:00
Mario Danic	573545d740	Fix remembering state/selection/etc	2017-04-28 10:39:53 +02:00
Mario Danic	b38866ebc7	Lots of magic	2017-04-28 10:39:52 +02:00
Mario Danic	16d79b4645	Fix build issue	2017-04-28 10:39:52 +02:00
Mario Danic	dac342cc25	Fix pkg name again	2017-04-28 10:39:52 +02:00
Mario Danic	1f5e134fb9	Fix codacy issues	2017-04-28 10:39:51 +02:00
Mario Danic	382ee5dc1c	Small reformat	2017-04-28 10:39:51 +02:00
Mario Danic	0994140d55	Progress on magic	2017-04-28 10:39:51 +02:00
Mario Đanić	28582da92a	Merge pull request #901 from nextcloud/gplay-edition ... Gplay edition	2017-04-28 10:01:44 +02:00
alejandro	10b48a21ec	Fixing imports	2017-04-27 15:23:36 -05:00
alejandro	58566337f6	Fix to load error page from raw	2017-04-27 15:11:04 -05:00
Mario Đanić	fd161aa99f	Merge pull request #897 from nextcloud/WebViewTitle ... if webview show app name	2017-04-27 14:54:47 +02:00
tobiasKaminsky	57f0df279a	use themed color instead of white	2017-04-27 14:53:31 +02:00
Andy Scherzinger	dc2bacc857	Merge pull request #908 from nextcloud/missingBottomBar ... add missing layout param	2017-04-27 14:19:53 +02:00
Andy Scherzinger	2de760428c	Merge pull request #902 from comradekingu/language ... Revamp of upstream strings	2017-04-27 14:19:12 +02:00
tobiasKaminsky	c5e2673309	add missing layout param	2017-04-27 13:05:19 +02:00
tobiasKaminsky	a5d255afed	prevent NPE if quotaLink does not exist, e.g. in manageaccount activity	2017-04-27 12:41:15 +02:00
AndyScherzinger	d0521c1c89	rename flag from logout to show_drawer_logout	2017-04-27 11:28:59 +02:00
tobiasKaminsky	003076eb14	ability to show custom error message for webview	2017-04-27 10:08:39 +02:00
AndyScherzinger	7a4c75aebb	fix logout button coloring	2017-04-27 09:19:11 +02:00
tobiasKaminsky	de9aa39c87	logout button in drawer	2017-04-27 09:19:11 +02:00
Allan Nordhøy	b5c7833895	Revamp of upstream strings	2017-04-27 06:44:41 +02:00
Nextcloud bot	7e5d7f1f4e	[tx-robot] updated from transifex	2017-04-27 00:21:31 +00:00
Mario Danic	5ecf2ea541	Fix up analytics	2017-04-26 21:59:46 +02:00
Mario Danic	7d1af571bc	Set screen name for a few more screens	2017-04-26 21:58:58 +02:00
Mario Danic	9130635fa1	Progress on Analytics magic	2017-04-26 21:58:00 +02:00
tobiasKaminsky	726a02f39c	Revert "remove firebase from branding branch and put it into branch "analytics"" ... This reverts commit 71ea26df31.	2017-04-26 21:57:59 +02:00
tobiasKaminsky	41494099f2	bottom bar in all activities	2017-04-26 20:40:25 +02:00
alejandro	0b6423ce72	Bug #843 was Fixed ... PreviewImageActivity is removed from the stack activity	2017-04-26 19:25:44 +02:00
Nextcloud bot	4efd85c748	[tx-robot] updated from transifex	2017-04-26 15:19:56 +00:00
Nextcloud bot	5415a42f14	[tx-robot] updated from transifex	2017-04-26 15:15:55 +00:00
tobiasKaminsky	92f12ac6a9	if webview show app name	2017-04-26 15:23:39 +02:00
Andy Scherzinger	af2eef9f15	Merge pull request #872 from nextcloud/nullInSharedView ... always refresh ocShares prior listing them to have an up-to-date ocFile	2017-04-26 09:34:10 +02:00
Nextcloud bot	3d71602697	[tx-robot] updated from transifex	2017-04-26 00:22:16 +00:00
Mario Đanić	8442c045c6	Merge pull request #870 from nextcloud/noFABinSearchView ... disable FAB on searchViews	2017-04-25 18:59:03 +02:00
Mario Đanić	3b7d46abdc	Merge pull request #867 from nextcloud/showSearchViewHeaders ... show correct header for searchViews & fix icon color and text for favorites	2017-04-25 18:46:57 +02:00
Mario Đanić	d8f6d80b4e	Merge pull request #866 from nextcloud/branding-options ... Tweak davdroid config option	2017-04-25 18:39:06 +02:00
Nextcloud bot	4d9df8073a	[tx-robot] updated from transifex	2017-04-25 00:20:25 +00:00
AndyScherzinger	87b810b959	add title method	2017-04-24 11:56:53 +02:00
AndyScherzinger	5f3a1ce9bb	#871 make favorite icon yellow and fix headline adding "yet"	2017-04-24 10:16:48 +02:00
tobiasKaminsky	6ee4ab23c7	show correct header for searchViews	2017-04-24 09:41:44 +02:00
Nextcloud bot	081c058b4c	[tx-robot] updated from transifex	2017-04-24 00:20:35 +00:00
Nextcloud bot	a70967efc0	[tx-robot] updated from transifex	2017-04-23 00:20:25 +00:00
Nextcloud bot	98f1641fe8	[tx-robot] updated from transifex	2017-04-22 00:21:04 +00:00
tobiasKaminsky	5319a63c33	always refresh ocShares prior listing them to have an uptodate ocFile	2017-04-21 15:36:44 +02:00
tobiasKaminsky	42f2ed267d	disable FAB on searchViews	2017-04-21 13:49:39 +02:00
Mario Danic	ca1355bf10	Tweak davdroid config option	2017-04-21 12:36:43 +02:00
Mario Đanić	618c472a72	Merge pull request #861 from nextcloud/renameNightlyToDev ... change all namings of beta/nightly to new "dev"	2017-04-21 10:03:20 +02:00
tobiasKaminsky	f33e022e7b	fix mediaplayer for real this time	2017-04-21 08:28:17 +02:00
tobiasKaminsky	550ae613a1	change all namings of beta/nightly to new "dev"	2017-04-21 07:32:24 +02:00
Nextcloud bot	dcc216b316	[tx-robot] updated from transifex	2017-04-21 00:20:51 +00:00
Mario Danic	f725ada65e	Fix prefs	2017-04-20 23:17:25 +02:00
Mario Đanić	9739edbbec	Merge pull request #624 from Flole998/master ... Added fingerprint support	2017-04-20 22:40:50 +02:00
Mario Đanić	5d50a1cc44	Merge pull request #858 from nextcloud/favoritesSwitchToGrid ... prevent NPE if trying to store grid preference for favorites/shared	2017-04-20 22:39:48 +02:00
Mario Đanić	5baf7860b2	Merge pull request #854 from nextcloud/swipeToRefreshSearch ... Swipe to refresh search	2017-04-20 22:39:34 +02:00
Mario Đanić	27150277a7	Merge pull request #853 from nextcloud/fixLongClicking ... fix missing long click in "search"	2017-04-20 22:39:01 +02:00
Mario Đanić	c19644f86b	Merge pull request #852 from nextcloud/preventCrashWhileRotating ... prevent crash when fetching search event while rotating	2017-04-20 22:38:47 +02:00
Mario Đanić	19705ff438	Merge branch 'master' into externalLinks	2017-04-20 22:37:56 +02:00
Mario Đanić	89f4d81ff1	Merge pull request #824 from nextcloud/contactBackupRestore ... Contact backup & import	2017-04-20 22:36:00 +02:00
AndyScherzinger	299f08694f	fixes due to code review	2017-04-20 21:51:08 +02:00
tobiasKaminsky	fe6171571f	prevent NPE if trying to store grid preference for favorites/shared	2017-04-20 15:34:36 +02:00
tobiasKaminsky	9377f22f51	swipe to refresh for "search"	2017-04-20 11:26:22 +02:00
tobiasKaminsky	95d9ea014c	fix missing long click in "search"	2017-04-20 11:21:25 +02:00
tobiasKaminsky	9c1339b1e4	prevent crash when fetching search event while rotating	2017-04-20 10:32:45 +02:00
AndyScherzinger	ed59604d3f	fixes after rebase	2017-04-20 09:09:14 +02:00
AndyScherzinger	744a1fc549	fix remove line	2017-04-20 09:09:13 +02:00
AndyScherzinger	8bdb8614e6	fixes after rebase due to project structure changes	2017-04-20 09:09:13 +02:00
Flole998	b291d6b3c1	Update strings.xml	2017-04-20 09:09:12 +02:00
Flole998	10f787b186	Update strings.xml	2017-04-20 09:09:12 +02:00
Flole	043ff2ad8f	Fixing issues mentioned in review.	2017-04-20 09:09:11 +02:00
Flole	99bf76657a	Added Fingerprint Support	2017-04-20 09:09:10 +02:00
Flole	8da1057f3b	Added Fingerprint Support	2017-04-20 09:08:59 +02:00
Nextcloud bot	fb4374d9fc	[tx-robot] updated from transifex	2017-04-20 00:21:12 +00:00
AndyScherzinger	cf7ccdfc65	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/strings.xml	2017-04-19 23:38:31 +02:00
AndyScherzinger	22976389c2	add generic circular avatars for contacts and use slightly smaller, more material like font size	2017-04-19 19:08:59 +02:00
AndyScherzinger	f9c0e1ca09	align text to the right	2017-04-19 18:31:20 +02:00
Mario Danic	312c09b902	Implement icon loading	2017-04-19 18:28:57 +02:00
AndyScherzinger	8187a2582f	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/setup.xml # src/modified/res/values/setup.xml	2017-04-19 18:25:51 +02:00
AndyScherzinger	4c46665d0c	Merge branch 'master' of https://github.com/nextcloud/android into notifications	2017-04-19 18:11:42 +02:00
AndyScherzinger	cb281d3bb1	further cleanups	2017-04-19 17:41:20 +02:00
AndyScherzinger	a04b3e63dc	cleanups	2017-04-19 17:09:45 +02:00
tobiasKaminsky	c070e9d1bb	missing merge commit	2017-04-19 16:26:29 +02:00
Mario Danic	c0f4b80c43	Implement checkboards for svg	2017-04-19 16:06:23 +02:00
AndyScherzinger	320d991c19	show SVG images	2017-04-19 16:06:22 +02:00
Mario Danic	b3a9c56511	Update things	2017-04-19 15:55:55 +02:00
Mario Danic	b787ee6caa	Work	2017-04-19 15:55:53 +02:00
Mario Danic	8ef8a68a86	Fix a few things	2017-04-19 15:54:55 +02:00
Mario Danic	047bd3cc8e	Work a bit more on notifications	2017-04-19 15:54:55 +02:00
AndyScherzinger	8604a14448	fix double method call	2017-04-19 15:54:54 +02:00
Mario Danic	e429f351a3	Fix drawer menu item	2017-04-19 15:54:54 +02:00
Mario Danic	efeeaf83d9	Make notifications single instance	2017-04-19 15:54:54 +02:00
Mario Danic	f21fe2b972	Remove push enabled	2017-04-19 15:54:53 +02:00
Mario Danic	1ea6607186	Improve custom handling	2017-04-19 15:54:53 +02:00
Mario Danic	9ea45c74a7	Basics of push	2017-04-19 15:54:53 +02:00
AndyScherzinger	a49f8792ee	WiP data fetching	2017-04-19 15:54:53 +02:00
AndyScherzinger	a382872313	WiP activity for notifications	2017-04-19 15:54:52 +02:00
Mario Danic	1ab159163c	Fix bunch of stuff	2017-04-19 15:54:52 +02:00
Mario Danic	9684e89daf	Fix drawer menu item	2017-04-19 15:54:52 +02:00
Mario Danic	537c6a12f4	Make notifications single instance	2017-04-19 15:54:52 +02:00
AndyScherzinger	8eeec5f891	add item divider via decorator	2017-04-19 15:54:51 +02:00
AndyScherzinger	ac088c14a0	initial UI implementation displaying notifications	2017-04-19 15:54:51 +02:00
Mario Danic	9e1ceebf9c	Remove push enabled	2017-04-19 15:54:51 +02:00
Mario Danic	c14d26f635	Improve custom handling	2017-04-19 15:54:51 +02:00
Mario Danic	dfc95e6edd	Basics of push	2017-04-19 15:54:50 +02:00
Mario Danic	6e934c5e6d	Fix notifications	2017-04-19 15:54:50 +02:00
Mario Danic	d66499e125	Try to fix	2017-04-19 15:54:50 +02:00
AndyScherzinger	669f68444d	WiP data fetching	2017-04-19 15:54:50 +02:00
AndyScherzinger	20ac3b4e69	empty list icon, use latest empty list layout and butterknife	2017-04-19 15:54:49 +02:00
AndyScherzinger	cb8c8caf7d	WiP activity for notifications	2017-04-19 15:54:49 +02:00
AndyScherzinger	0325dd37e5	notifications icon work	2017-04-19 15:54:49 +02:00
Mario Đanić	0677d536c0	Merge pull request #845 from nextcloud/fixNavigation ... bugfix for #798	2017-04-19 15:16:18 +02:00
tobiasKaminsky	06275e0f79	and the last one...	2017-04-19 14:54:36 +02:00
tobiasKaminsky	0d29d949c5	fixed missing drawer events	2017-04-19 14:52:26 +02:00
Mario Đanić	1a18de8cc4	Merge pull request #826 from nextcloud/fix_bug_firstlogin ... Fix bug firstlogin	2017-04-19 14:39:21 +02:00
Tobias Kaminsky	20e83d269b	Merge pull request #830 from nextcloud/fix-fileprovider ... Fix fileprovider	2017-04-19 14:07:57 +02:00
Tobias Kaminsky	751e5068d1	Merge pull request #828 from nextcloud/fix-branding ... Improve branding	2017-04-19 14:02:09 +02:00
Andy Scherzinger	abe6f9fb42	Merge pull request #832 from nextcloud/remove-play-stuff ... Remove gcm stuff	2017-04-19 13:42:50 +02:00
tobiasKaminsky	1a6b14c0ff	bugfix for #798 ... checking cast if remote request is long running preventing MissingActivityException if fragment is detached from Activity	2017-04-19 13:41:31 +02:00
Tobias Kaminsky	2033b81f80	Merge pull request #829 from nextcloud/ignore-thumbnails ... Ignore thumbnail files	2017-04-19 12:22:15 +02:00
Mario Đanić	e9c9884357	Merge pull request #827 from nextcloud/welcome-webview ... Implement webview welcome pages	2017-04-19 09:05:17 +02:00
tobiasKaminsky	ae75177f75	smaller borders, vertical centered text	2017-04-19 08:45:46 +02:00
Nextcloud bot	9da87449d7	[tx-robot] updated from transifex	2017-04-19 00:21:05 +00:00
alejandro	7701b697a1	Revert "Bug #810 was Fixed" ... This reverts commit 845762f8d0.	2017-04-18 10:13:48 -05:00
Mario Đanić	34f79b757f	Merge pull request #825 from nextcloud/fix_bug_mediaplayer ... Bug #810 Media Control	2017-04-18 16:54:52 +02:00
tobiasKaminsky	33544f65e7	hide search and option menu when showing contact list	2017-04-18 10:55:46 +02:00
tobiasKaminsky	54f8d3091c	use input stream reader for backward compatibility	2017-04-18 10:41:09 +02:00
tobiasKaminsky	57d210c49f	use collections sort to support older apis	2017-04-18 10:34:08 +02:00
tobiasKaminsky	c4e2e6a07f	prevent NPE if name is null	2017-04-18 09:33:24 +02:00
tobiasKaminsky	c47408d33c	Merge remote-tracking branch 'origin/master' into contactBackupRestore	2017-04-18 09:14:13 +02:00
tobiasKaminsky	e0a71f8810	Merge remote-tracking branch 'remotes/origin/contactBackupRestore' into contactBackupRestore	2017-04-18 09:07:41 +02:00
tobiasKaminsky	fa414c2a1b	"backup now" asks for permission	2017-04-18 09:01:44 +02:00
tobiasKaminsky	3186c21619	do not explicity start the service ... always unbind	2017-04-18 08:50:19 +02:00
Mario Đanić	c76943803b	Merge pull request #836 from nextcloud/UploadListCount ... Upload: count uploads	2017-04-18 08:36:07 +02:00
tobiasKaminsky	84ff5832ba	satisfy codacy ;-)	2017-04-18 08:23:56 +02:00
tobiasKaminsky	0ab392a00d	use recyclerview	2017-04-18 08:23:56 +02:00
tobiasKaminsky	d058efc2de	contact list: text is now in line with header ... round images	2017-04-18 08:23:56 +02:00
tobiasKaminsky	9aff159c16	make headlines bold ... set initial state of last backup to "never"	2017-04-18 08:23:55 +02:00
tobiasKaminsky	72ee736184	expire files on daily backup is now working	2017-04-18 08:23:55 +02:00
tobiasKaminsky	b23b46dfe8	fix showing wrong jobs, only autoUploadJobs should be shown in UploadActivity	2017-04-18 08:23:55 +02:00
tobiasKaminsky	bdc549eee7	fix showing wrong badges	2017-04-18 08:23:55 +02:00
tobiasKaminsky	35e683546c	contact backup & import	2017-04-18 08:23:55 +02:00
Nextcloud bot	538ca93c5a	[tx-robot] updated from transifex	2017-04-18 00:20:54 +00:00
AndyScherzinger	708a261409	minor material design layout fixes	2017-04-17 20:12:27 +02:00
tobiasKaminsky	5c01f75c64	satisfy codacy ;-)	2017-04-17 19:45:17 +02:00
tobiasKaminsky	b5a9813cbc	use recyclerview	2017-04-17 19:45:17 +02:00
tobiasKaminsky	16296153de	contact list: text is now in line with header ... round images	2017-04-17 19:45:16 +02:00
tobiasKaminsky	9c37334ef7	make headlines bold ... set initial state of last backup to "never"	2017-04-17 19:45:16 +02:00
tobiasKaminsky	07e3fc524d	expire files on daily backup is now working	2017-04-17 19:45:16 +02:00
tobiasKaminsky	9d1f2666cd	fix showing wrong jobs, only autoUploadJobs should be shown in UploadActivity	2017-04-17 19:45:15 +02:00
tobiasKaminsky	778c4e9ec2	fix showing wrong badges	2017-04-17 19:45:15 +02:00
tobiasKaminsky	d1d01db7a1	contact backup & import	2017-04-17 19:45:12 +02:00
AndyScherzinger	c90354af17	For pending, failed, etc. show the item count	2017-04-17 19:25:12 +02:00
Nextcloud bot	8d3617a742	[tx-robot] updated from transifex	2017-04-17 00:20:39 +00:00
Nextcloud bot	d024dceb9e	[tx-robot] updated from transifex	2017-04-16 00:20:42 +00:00
Nextcloud bot	c5744c61b5	[tx-robot] updated from transifex	2017-04-15 00:22:23 +00:00
Nextcloud bot	e781d20704	[tx-robot] updated from transifex	2017-04-14 00:21:31 +00:00
Mario Danic	8717832fbb	Remove gcm stuff	2017-04-13 22:54:37 +02:00
tobiasKaminsky	f239dfbdb2	put icon fetching into DisplayUtils	2017-04-13 13:49:58 +02:00
tobiasKaminsky	031a9c34a7	add break to switch	2017-04-13 13:42:53 +02:00
Mario Danic	ce1d0e639b	Updated all	2017-04-13 09:41:01 +02:00
Nextcloud bot	392d51f19b	[tx-robot] updated from transifex	2017-04-13 00:21:57 +00:00
Mario Danic	b6aa977bb4	Fix fileprovider	2017-04-13 01:01:53 +02:00
Mario Danic	2c50823c44	Ignore thumbnail files	2017-04-13 00:55:08 +02:00
Mario Danic	ba698ffc43	Improve branding	2017-04-13 00:51:07 +02:00
Mario Danic	45c03a8203	Implement webview welcome pages	2017-04-13 00:32:05 +02:00
alejandro	8f11cb2c27	Bug #823 was Fixed ... The App shows the files after the first login	2017-04-12 13:09:11 -05:00
alejandro	845762f8d0	Bug #810 was Fixed ... The fragment show the media controls	2017-04-12 12:42:10 -05:00
Nextcloud bot	f3343748f5	[tx-robot] updated from transifex	2017-04-12 00:21:00 +00:00
alejandro	cf3fbc79c6	Bug #811 was Fixed ... External Links are marked grey in the Drawer	2017-04-11 17:44:47 -05:00
Nextcloud bot	5d3f5eb698	[tx-robot] updated from transifex	2017-04-11 00:20:47 +00:00
Nextcloud bot	55106ec8a7	[tx-robot] updated from transifex	2017-04-10 00:22:04 +00:00
Nextcloud bot	190d3b0075	[tx-robot] updated from transifex	2017-04-09 00:21:20 +00:00
Nextcloud bot	af1ea3758e	[tx-robot] updated from transifex	2017-04-08 00:21:29 +00:00
tobiasKaminsky	df9c1ae640	show quota link right on start	2017-04-07 09:05:38 +02:00
tobiasKaminsky	3c75cf9b9b	fix icon size	2017-04-07 08:46:29 +02:00
Nextcloud bot	c05abb6952	[tx-robot] updated from transifex	2017-04-07 00:22:55 +00:00
tobiasKaminsky	82b02788d0	generic: link, progressBar, percentage ... modified: percentage, progressbar, link	2017-04-06 17:15:59 +02:00
tobiasKaminsky	f59e80eda4	external links are loaded as soon as possible, important for very first start	2017-04-06 16:44:06 +02:00
tobiasKaminsky	73322ad800	image loading via glide ... add fallback icons	2017-04-06 15:27:12 +02:00
tobiasKaminsky	e24f292026	update links in drawer from database every time to get new links asap	2017-04-06 12:04:55 +02:00
tobiasKaminsky	f63258bf17	fetch only every 10th time	2017-04-06 12:04:23 +02:00
tobiasKaminsky	2f405f11a1	in setting: prevent drawer opening via swipe right	2017-04-06 11:45:55 +02:00
tobiasKaminsky	fda9ae0541	links in drawer are updated when entering fileDisplayActivity again	2017-04-06 11:45:55 +02:00
tobiasKaminsky	6dfb72cefd	to satisfy codacy ;-)	2017-04-06 11:45:54 +02:00
tobiasKaminsky	099c62ec6c	according to codacy	2017-04-06 11:45:54 +02:00
tobiasKaminsky	b94bce3f63	npe on very first start	2017-04-06 11:45:54 +02:00
tobiasKaminsky	a5c2cc0fb6	display external links, disabled by default ... stored in database	2017-04-06 11:45:54 +02:00
tobiasKaminsky	843b76333e	config webview	2017-04-06 11:45:54 +02:00
tobiasKaminsky	dfbfd051f4	added webview support	2017-04-06 11:45:53 +02:00
Nextcloud bot	5b6ecabae8	[tx-robot] updated from transifex	2017-04-06 00:21:41 +00:00
Tobias Kaminsky	8ff753f623	Merge pull request #607 from nextcloud/integration-with-master ... PNG files have full-screen checkerboard background & Better emptycontent view for file types which can not be shown	2017-04-05 08:35:56 +02:00
Nextcloud bot	0d43197c9c	[tx-robot] updated from transifex	2017-04-05 00:22:13 +00:00
Nextcloud bot	9ade2f8a46	[tx-robot] updated from transifex	2017-04-04 00:20:53 +00:00
AndyScherzinger	a9a029fcc5	a	2017-04-03 23:27:33 +02:00
AndyScherzinger	de825e2238	Merge branch 'master' of https://github.com/nextcloud/android into integration-with-master ... # Conflicts: # src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java # src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java # src/main/res/values-en-rGB/strings.xml	2017-04-03 23:20:30 +02:00
Nextcloud bot	7e4b3fb858	[tx-robot] updated from transifex	2017-04-03 00:21:37 +00:00
Nextcloud bot	1ae9d87da6	[tx-robot] updated from transifex	2017-04-02 00:21:26 +00:00
Nextcloud bot	bfe0dea784	[tx-robot] updated from transifex	2017-04-01 00:21:41 +00:00
AndyScherzinger	89b5554276	fix UI glitch	2017-03-31 16:11:16 +02:00
AndyScherzinger	91f984eff6	design optimized layout changes	2017-03-31 16:11:16 +02:00
Andy Scherzinger	2fdbf5d8e7	Merge pull request #742 from nextcloud/favourites ... Search and others	2017-03-31 16:10:31 +02:00
AndyScherzinger	8f265b4c9e	use fav strings as used on the webUI	2017-03-31 11:21:06 +02:00
AndyScherzinger	ed771603ef	menu ordering	2017-03-31 11:09:33 +02:00
AndyScherzinger	a0f1b15b81	add proper star icon for menus	2017-03-31 11:02:44 +02:00
AndyScherzinger	6b2e0f54ce	fix menu	2017-03-31 10:07:20 +02:00
Nextcloud bot	9f2a8158f6	[tx-robot] updated from transifex	2017-03-31 00:21:57 +00:00
AndyScherzinger	3d17ac886b	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle # src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java # src/main/res/menu/drawer_menu.xml	2017-03-31 01:57:38 +02:00
Andy Scherzinger	7706fdb8fc	Merge pull request #784 from nextcloud/activities ... Activities	2017-03-31 01:12:06 +02:00
Andy Scherzinger	98540e4693	Merge pull request #772 from nextcloud/fix-snapchat-etc ... Fix snapchat etc	2017-03-31 00:47:00 +02:00
AndyScherzinger	28cb271d72	fit message according to the webUI	2017-03-31 00:36:04 +02:00
AndyScherzinger	10c6bf1d98	add another missing break;	2017-03-30 23:36:59 +02:00
AndyScherzinger	32ea8d2769	fix codacy	2017-03-30 23:24:37 +02:00
AndyScherzinger	5bc727e5cb	proper use of generics for view holder	2017-03-30 23:21:01 +02:00
AndyScherzinger	472f300e26	minor layout changes	2017-03-30 23:08:01 +02:00
Mario Danic	c023e3f92f	Fix fab again	2017-03-30 16:42:39 +02:00
Mario Danic	fb478debab	Progress on fixing activities for older versions	2017-03-30 15:43:42 +02:00
Mario Danic	8099055fe9	Fix activity	2017-03-30 14:49:53 +02:00
Mario Danic	a57cb2e368	Working on everything	2017-03-30 12:10:11 +02:00
Mario Danic	5da789e253	Remove stacktrace	2017-03-30 10:31:12 +02:00
Mario Danic	a553590a24	Add empty view	2017-03-30 10:29:52 +02:00
Nextcloud bot	056b4d9be8	[tx-robot] updated from transifex	2017-03-30 00:21:08 +00:00
AndyScherzinger	146bfd63d6	remove paragraph entities and stackTrace calls	2017-03-29 23:37:04 +02:00
AndyScherzinger	72e87810bf	fixed empty fav list icon	2017-03-29 22:58:23 +02:00
AndyScherzinger	d0bd2707fb	revert back to frame layout for icon badges' size	2017-03-29 22:51:08 +02:00
alejandro	8a0974c656	Support for SVG icons with Glide and Android SVG	2017-03-29 12:04:35 -06:00
Mario Danic	8b7ecc4392	Implement shared files	2017-03-29 18:21:56 +02:00
Mario Danic	cd17ac2c7a	Start working on shared filter	2017-03-29 10:38:43 +02:00
Mario Danic	6bdb618014	Implement favorites	2017-03-29 09:55:23 +02:00
Nextcloud bot	cb753fd332	[tx-robot] updated from transifex	2017-03-29 00:20:33 +00:00
alejandro	6e993b6641	Message to Empty List	2017-03-28 16:54:47 -06:00
alejandro	67c8cafeda	UI Implementation displaying activities	2017-03-28 15:21:50 -06:00
Mario Danic	94daa19dc4	Fix fabmain	2017-03-28 18:53:38 +02:00
Mario Danic	d56855e2a9	Fix layouts	2017-03-28 18:24:48 +02:00
Nextcloud bot	a92e7e31aa	[tx-robot] updated from transifex	2017-03-28 00:20:53 +00:00
AndyScherzinger	e06476f3e6	large empty list icon	2017-03-27 23:40:59 +02:00
AndyScherzinger	84c265d8c6	added license header	2017-03-27 23:40:58 +02:00
AndyScherzinger	04679b12f8	initial menu add and empty activity	2017-03-27 23:40:58 +02:00
AndyScherzinger	0ab3e27c1e	activity icon work	2017-03-27 23:40:57 +02:00
AndyScherzinger	e828cc701b	Merge branch 'master' of https://github.com/nextcloud/android into favourites	2017-03-27 23:35:04 +02:00
Mario Danic	d4ad5da980	Delete if not found	2017-03-27 21:59:45 +02:00
Mario Danic	7a1a84cb50	Clean update	2017-03-27 21:59:44 +02:00
Mario Danic	0d7298326a	Fix media provider	2017-03-27 21:59:42 +02:00
AndyScherzinger	4144cae6d5	remove javaDoc <p>	2017-03-27 21:42:15 +02:00
Mario Danic	54453bd21d	Fix	2017-03-27 21:28:14 +02:00
Mario Danic	6bf7476081	Add support for web login	2017-03-27 21:27:14 +02:00
Mario Danic	99104058de	List item	2017-03-27 19:14:54 +02:00
AndyScherzinger	bae932ea82	removed nested if statements	2017-03-27 18:08:12 +02:00
AndyScherzinger	9ffb4c6639	#781 add icons to website/twitter on user info screen, cleanup	2017-03-27 17:45:00 +02:00
AndyScherzinger	b433178914	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java	2017-03-27 13:16:53 +02:00
Mario Danic	b4ed6a8d78	Fix issue with fab	2017-03-27 10:28:31 +02:00
Mario Danic	6fdb67b593	Fix a few issues	2017-03-27 09:29:16 +02:00
Mario Đanić	28aa44b0c2	Merge pull request #575 from nextcloud/newSortingLayout ... New sorting order dialog	2017-03-27 07:20:48 +02:00
Nextcloud bot	87b930f251	[tx-robot] updated from transifex	2017-03-27 00:20:55 +00:00
AndyScherzinger	933dbccba6	Merge branch 'master' of https://github.com/nextcloud/android into favourites	2017-03-26 16:15:07 +02:00
AndyScherzinger	a5e5cb85c2	move to new folder structure after branding	2017-03-26 16:11:04 +02:00
AndyScherzinger	a28a0e9d90	slightly shorten code	2017-03-26 16:11:03 +02:00
AndyScherzinger	6086ff81c6	redesign of dialog according to design review/mock/feedback	2017-03-26 16:11:02 +02:00
AndyScherzinger	c1867c0509	move image button icon coloring to DisplayUtils	2017-03-26 16:11:02 +02:00
AndyScherzinger	d13d064d62	integrate new sorting dialog into Upload file activity	2017-03-26 16:11:01 +02:00
AndyScherzinger	0490d52270	minor tweaking and fixes for ordering	2017-03-26 16:11:00 +02:00
AndyScherzinger	d0a6e6ea26	wired the new sorting order fragment	2017-03-26 16:11:00 +02:00
AndyScherzinger	4a14e0fae6	default to alphabetical ascending	2017-03-26 16:10:59 +02:00
AndyScherzinger	8e884b8cf5	new sorting order dialog	2017-03-26 16:10:58 +02:00
AndyScherzinger	bf326394ef	move to new project structure	2017-03-26 15:56:31 +02:00
tobiasKaminsky	0ebdb7e343	remove unnecessary textview	2017-03-26 15:56:30 +02:00
tobiasKaminsky	2cbdddffc3	add image for downloading nightly ... fix url	2017-03-26 15:56:25 +02:00
tobiasKaminsky	354e008665	showing introduction screen is now customizable by setup.xml, enabled by default	2017-03-26 15:32:40 +02:00
Andy Scherzinger	7a899b0737	Merge pull request #753 from nextcloud/login-branding ... Login branding	2017-03-26 15:28:39 +02:00
AndyScherzinger	0a83e7d3ee	fix 120 character line margin	2017-03-26 15:17:39 +02:00
AndyScherzinger	fae9d48784	remove paragraph entities from javaDoc	2017-03-26 15:15:29 +02:00
Nextcloud bot	321d316d4b	[tx-robot] updated from transifex	2017-03-26 04:08:59 +00:00
AndyScherzinger	deb9c23173	fix codacy warning	2017-03-26 03:00:01 +02:00
AndyScherzinger	7d7e6bdc74	move due to new project structure	2017-03-26 01:34:12 +01:00
Mario Danic	e73091a212	Use constants	2017-03-26 01:34:12 +01:00
Mario Danic	d079808c6d	Fix password change	2017-03-26 01:34:11 +01:00
AndyScherzinger	22a2f92909	id	2017-03-26 01:34:11 +01:00
AndyScherzinger	53e67c431e	fix codacy warnings and formatting	2017-03-26 01:34:11 +01:00
Mario Danic	96e8e16829	Remove hint from land	2017-03-26 01:34:10 +01:00
Mario Danic	e6adc4fd95	Add support for various server types	2017-03-26 01:34:10 +01:00
Mario Danic	bd16eb7146	Partly works	2017-03-26 01:34:10 +01:00
AndyScherzinger	d84ff3917c	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle	2017-03-26 01:20:57 +01:00
AndyScherzinger	782654a314	remove unneeded full qualified calls name use	2017-03-26 01:04:30 +01:00
AndyScherzinger	681f8adc25	organize imports	2017-03-26 01:03:21 +01:00
AndyScherzinger	f0a4db8877	move members to the top	2017-03-26 01:01:52 +01:00
AndyScherzinger	bfe6dbe80a	move files for new project structure	2017-03-26 00:51:28 +01:00
AndyScherzinger	0b9f9f8bf2	fix CR and UI glitches	2017-03-26 00:51:26 +01:00
Mario Danic	a4138da5d0	Fix codacy issues	2017-03-26 00:51:23 +01:00
Mario Danic	fad7f9f4d5	Implement user information magic	2017-03-26 00:51:22 +01:00
Mario Danic	64ccfe8c0d	Add user display name support	2017-03-26 00:51:21 +01:00
Mario Danic	708b48c785	First bits of user info code	2017-03-26 00:51:20 +01:00
Mario Danic	db02da1409	Fix codacy issues	2017-03-26 00:51:19 +01:00
Mario Danic	df44118185	Implement user information magic	2017-03-26 00:51:18 +01:00
Mario Danic	d010a71308	Add user display name support	2017-03-26 00:51:17 +01:00
Mario Danic	3ec59a89a0	First bits of user info code	2017-03-26 00:51:16 +01:00
Mario Danic	e507f06606	Implement user information magic	2017-03-26 00:51:16 +01:00
Mario Danic	28d6ccb7d6	Add user display name support	2017-03-26 00:51:15 +01:00
Mario Danic	5339fd7587	First bits of user info code	2017-03-26 00:51:14 +01:00
Mario Danic	eaae09877f	Fix codacy issues	2017-03-26 00:51:13 +01:00
Mario Danic	3e21b5b0dd	Implement user information magic	2017-03-26 00:51:12 +01:00
Mario Danic	e224cb0f2a	First bits of user info code	2017-03-26 00:51:12 +01:00
Mario Danic	98782994f0	Implement user information magic	2017-03-26 00:51:12 +01:00
Mario Danic	2ba88eed79	First bits of user info code	2017-03-26 00:51:11 +01:00
Mario Danic	7ccac590f0	Fix codacy issues	2017-03-26 00:51:10 +01:00
Mario Danic	f4ab569226	Implement user information magic	2017-03-26 00:51:09 +01:00
Mario Danic	5c94246275	Add user display name support	2017-03-26 00:51:08 +01:00
Mario Danic	38f1cc0e28	First bits of user info code	2017-03-26 00:51:07 +01:00
AndyScherzinger	5f0944ab78	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle	2017-03-26 00:50:02 +01:00
Andy Scherzinger	feddb43c5d	Merge pull request #773 from nextcloud/update-android-job ... Update android job	2017-03-26 00:43:44 +01:00
Mario Danic	7f0fb21ae8	Fix files search icon	2017-03-24 23:31:21 +01:00
Mario Danic	36b4e168d7	Fix favorites	2017-03-24 19:23:51 +01:00
Mario Danic	a8ed34fe97	Fix list view clicks	2017-03-24 19:12:37 +01:00
Mario Danic	0258811e85	Fix video upload path	2017-03-24 14:04:21 +01:00
Mario Danic	13d62e651e	Remove analytics instance	2017-03-24 09:46:35 +01:00
Mario Danic	0d24f87717	Merge branch 'master' into favourites ... # Conflicts: # src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java	2017-03-24 09:44:50 +01:00
Mario Danic	3e7e7b38fe	Fix a few codacy issues	2017-03-24 09:37:29 +01:00
Mario Danic	7ed5dd7d78	Fix menu stuff	2017-03-24 09:30:03 +01:00
Mario Danic	393e64fcff	Fix menu setup	2017-03-24 02:36:04 +01:00
Mario Danic	2bc4d29f98	Clean up	2017-03-24 02:27:36 +01:00
Mario Danic	c6d6fc82f0	Update android job	2017-03-23 20:58:55 +01:00
Mario Danic	adfb581ef6	Merge branch 'master' into branding	2017-03-22 21:16:12 +01:00
tobiasKaminsky	71ea26df31	remove firebase from branding branch and put it into branch "analytics"	2017-03-22 20:18:37 +01:00
AndyScherzinger	02e94fb21a	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-21 16:48:42 +01:00
Mario Danic	a046fead8f	Fix favorites toggle	2017-03-20 00:43:13 +01:00
Mario Danic	62d39e7654	Fix a few favorite things	2017-03-20 00:23:34 +01:00
Mario Danic	d887c08897	Fix loading	2017-03-20 00:18:16 +01:00
Mario Danic	3579c02cee	Fix recently modified sort	2017-03-20 00:06:54 +01:00
Mario Danic	171544c6bb	Progress on search	2017-03-19 23:47:56 +01:00
Mario Danic	58e1208c51	Store favorites in database	2017-03-19 23:02:36 +01:00
Mario Danic	705ea85060	Work a bit on favorites	2017-03-19 22:12:44 +01:00
AndyScherzinger	ca0f1bbb2d	partial click fix	2017-03-19 14:05:50 +01:00
Mario Danic	59c5eccf6a	Grid image favourite focus	2017-03-19 11:18:38 +01:00
Mario Danic	85a37b563f	Revert "Update branding setup" ... This reverts commit d7161474a2.	2017-03-17 19:09:17 +01:00
Mario Danic	dd3f303505	Merge branch 'branding' into favourites	2017-03-17 18:28:24 +01:00
Mario Danic	d7161474a2	Update branding setup	2017-03-17 18:28:14 +01:00
Mario Danic	d4af7441fc	Merge branch 'branding' into favourites ... # Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties	2017-03-17 18:26:26 +01:00
Mario Danic	105f609a3f	Properly remove add account	2017-03-17 17:13:25 +01:00
AndyScherzinger	4077980ea0	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-16 23:09:58 +01:00
Mario Danic	8a04689e92	Fix sharing	2017-03-16 18:04:21 +01:00
Mario Danic	3c68e865e2	Fix layout issues	2017-03-15 01:18:14 +01:00
Mario Danic	926001bbe7	Hide videos if search isn’t supported	2017-03-15 00:17:17 +01:00
Mario Danic	274aa7e9a8	Fix UI issues	2017-03-15 00:12:17 +01:00
AndyScherzinger	7c1e06bbc8	Merge branch 'favourites' of https://github.com/nextcloud/android into favourites ... # Conflicts: # src/main/res/layout/grid_item.xml # src/main/res/layout/list_item.xml	2017-03-14 23:10:54 +01:00
Mario Danic	3c472d7ccc	Fix loading view	2017-03-14 23:06:40 +01:00
Mario Danic	11c199eb2b	Add favorite buttons	2017-03-14 23:06:40 +01:00
Mario Danic	5b77f4b702	Fix menu items	2017-03-14 23:06:40 +01:00
Mario Danic	66cf030b39	Sort favorites and recently modified	2017-03-14 23:06:40 +01:00
Mario Danic	cf8a72f992	Continue work	2017-03-14 23:06:40 +01:00
AndyScherzinger	022fc5f712	empty list error icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	66904769a5	empty list video/image icons	2017-03-14 23:06:40 +01:00
AndyScherzinger	fd326c0cb9	menu shared icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	d79c90ac89	shared icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	0252cb4091	recent icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	67061c89fc	home icon	2017-03-14 23:06:40 +01:00
Mario Danic	b43261e8da	Progress on number of things	2017-03-14 23:06:40 +01:00
Mario Danic	579e501b6f	Save current search type	2017-03-14 23:06:40 +01:00
Mario Danic	4368a0a155	Unset items on settings & home click	2017-03-14 23:06:40 +01:00
Mario Danic	c29075ee47	Progress on all fronts	2017-03-14 23:06:40 +01:00
Mario Danic	fce9ba9fc0	Select home on home back	2017-03-14 23:06:40 +01:00
Mario Danic	49c01f1d74	Significant progress on various things	2017-03-14 23:06:40 +01:00
Mario Danic	4a510c578a	Use favourite	2017-03-14 23:05:51 +01:00
Mario Danic	beba6ca11e	Some progress on search	2017-03-14 23:05:51 +01:00
AndyScherzinger	565aa84655	empty view star icon	2017-03-14 23:05:51 +01:00
AndyScherzinger	8a2b838f4e	missing xxhdpi favorite icon	2017-03-14 23:05:51 +01:00
AndyScherzinger	b1a2934bec	xxxhdpi favorite icons	2017-03-14 23:05:51 +01:00
AndyScherzinger	fcc5a816f8	grey star icon (80% opacity)	2017-03-14 23:05:51 +01:00
Mario Danic	7b51b72c42	Refactor available offline	2017-03-14 23:05:51 +01:00
Mario Danic	f0249be463	Fix search users	2017-03-14 22:59:35 +01:00
AndyScherzinger	712b2f98dc	fix click event hadling via setting focusable attribute right	2017-03-14 22:45:59 +01:00
Mario Danic	d950e92805	Fix loading view	2017-03-14 22:18:14 +01:00
Mario Danic	aa53f63197	Add favorite buttons	2017-03-14 21:59:28 +01:00
Mario Danic	d6eadb1d33	Fix menu items	2017-03-14 21:59:28 +01:00
Mario Danic	b13b155054	Sort favorites and recently modified	2017-03-14 21:59:27 +01:00
Mario Danic	3058682268	Continue work	2017-03-14 21:59:27 +01:00
AndyScherzinger	4af76bccee	empty list error icon	2017-03-14 21:59:26 +01:00
AndyScherzinger	ba9d8da85f	empty list video/image icons	2017-03-14 21:59:26 +01:00
AndyScherzinger	ad5de57454	menu shared icon	2017-03-14 21:59:26 +01:00
AndyScherzinger	5b4624025a	shared icon	2017-03-14 21:59:25 +01:00
AndyScherzinger	8e0810b9d9	recent icon	2017-03-14 21:59:25 +01:00
AndyScherzinger	eed3995721	home icon	2017-03-14 21:59:24 +01:00
Mario Danic	3a3c4767fd	Progress on number of things	2017-03-14 21:59:24 +01:00
Mario Danic	9f94104eed	Save current search type	2017-03-14 21:59:23 +01:00
Mario Danic	0ac0610e13	Unset items on settings & home click	2017-03-14 21:59:23 +01:00
Mario Danic	b0700a38e9	Progress on all fronts	2017-03-14 21:59:23 +01:00
Mario Danic	1e16812ab3	Select home on home back	2017-03-14 21:59:22 +01:00
Mario Danic	b0835b981f	Significant progress on various things	2017-03-14 21:59:22 +01:00
Mario Danic	add50e3149	Use favourite	2017-03-14 21:59:22 +01:00
Mario Danic	bb3dfac2d4	Some progress on search	2017-03-14 21:59:21 +01:00
AndyScherzinger	4a14fdc33b	empty view star icon	2017-03-14 21:59:21 +01:00
AndyScherzinger	1415efe7f2	missing xxhdpi favorite icon	2017-03-14 21:59:20 +01:00
AndyScherzinger	4218c02522	xxxhdpi favorite icons	2017-03-14 21:59:20 +01:00
AndyScherzinger	3a345a5e5a	grey star icon (80% opacity)	2017-03-14 21:59:20 +01:00
Mario Danic	3fa0c5ca32	Refactor available offline	2017-03-14 21:59:19 +01:00
AndyScherzinger	2fbc7d05cf	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-14 21:56:31 +01:00
Mario Danic	f14d340dae	Add all required screen names	2017-03-06 12:08:51 +01:00
Mario Danic	1732f7dc73	Some work on Firebase integration	2017-03-06 09:58:50 +01:00
Mario Danic	21e8f5530b	Merge branch 'master' into branding	2017-03-06 08:10:16 +01:00
Mario Danic	b7e41eeff1	Fix gradle and supresswarnings issue	2017-03-05 21:20:54 +01:00
Mario Danic	db829c5e56	Remove useless files	2017-03-05 21:11:29 +01:00
Mario Danic	0ffb67c506	Merge branch 'branding' into bring-branding-to-master ... # Conflicts: # .drone.yml # build.gradle # src/main/java/com/owncloud/android/services/SyncedFolderJobService.java # src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java # src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java	2017-03-05 21:09:36 +01:00
Mario Danic	72349b5ef9	Merge branch 'master' into branding	2017-03-02 12:46:00 +01:00
Mario Danic	5b4b8bd20f	Remove enable_analytics magic	2017-03-02 12:40:25 +01:00
Mario Danic	27e486458a	Put quota text back to its place	2017-03-02 12:36:28 +01:00
Mario Danic	364d82c0c0	Clean up things	2017-02-27 11:10:34 +01:00
Mario Danic	6b1cf6895d	Merge branch 'master' into branding	2017-02-27 10:17:00 +01:00
Mario Danic	ad357ef071	Add missing string to main strings	2017-02-25 10:16:38 +01:00
Mario Danic	05367bf9ab	Fix string	2017-02-25 03:47:31 +01:00
Mario Danic	1052986243	Fix authorities	2017-02-25 03:43:08 +01:00
Mario Danic	088e345ea5	custom variables	2017-02-25 02:44:32 +01:00
Mario Danic	10102c0f2d	Remove currently unused variable	2017-02-25 02:44:32 +01:00
Mario Danic	7b57687fed	Remove majority of custom folder	2017-02-25 02:44:32 +01:00
Mario Danic	749cbcf31c	Move the generic MainApp	2017-02-25 02:44:31 +01:00
Mario Danic	dba8c4ed6e	Move things around	2017-02-25 02:44:31 +01:00
Mario Danic	40913110f0	Rename the variable	2017-02-25 02:44:31 +01:00
Mario Danic	cc9ff688e7	Remove 1 (one!) new entry into setup.xml	2017-02-25 02:44:31 +01:00
Mario Danic	c7eed23de9	Add Google Firebase analytics	2017-02-25 02:44:31 +01:00
Mario Danic	06d3f89f20	Add third parties properly	2017-02-25 02:44:31 +01:00
Mario Danic	0110e54ebe	Add new customization options	2017-02-25 02:44:31 +01:00
Mario Danic	16f1243da6	Fix project structure and prepare for branding	2017-02-25 02:44:31 +01:00