mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 08:44:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
7587 commits 221 branches 1589 tags 640 MiB
Commit graph

4305 commits

Author SHA1 Message Date
davigonz
d07b037da4
Fix bug maintenance mode in share view 2017-05-12 15:45:51 +02:00
davigonz
74e2438ada
Changed maintenance mode message 2017-05-12 15:45:50 +02:00
davigonz
036b34ca3c
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:45:50 +02:00
davigonz
597f0deebd
Change dynamically the maintenance mode message with the name of the app 2017-05-12 15:45:50 +02:00
davigonz
3a1c523d76
Show maintenance mode message while authenticating 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:45:49 +02:00
davigonz
88e85f1520
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations 2017-05-12 15:45:49 +02:00
davigonz
3241127b8d
Show maintenance mode message while downloading, removing, renaming or creating folder operations 2017-05-12 15:45:48 +02:00
davigonz
d98e33235a
Show maintenance mode error in notifications while uploading a file 
# Conflicts:
#	build.gradle
#	res/values/strings.xml
 2017-05-12 15:45:48 +02:00
AndyScherzinger
63e271d7d1
fix codacy warning 2017-05-12 15:45:48 +02:00
AndyScherzinger
6fbeaf4cae
fix compile error 2017-05-12 15:45:47 +02:00
AndyScherzinger
884df0c604
code shortening after rebase 2017-05-12 15:45:47 +02:00
davigonz
91c8f11f2a
Fix pull request requested changes 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
#	src/com/owncloud/android/utils/ErrorMessageAdapter.java
 2017-05-12 15:45:46 +02:00
davigonz
d4c4d4a62a
Change evaluation order to prevent calling existFile method if maintenance mode is enabled 2017-05-12 15:45:46 +02:00
davigonz
ffef0fe77a
Fix bug Unsharing in maintenance mode removes the file 2017-05-12 15:45:45 +02:00
davigonz
33bbbb0be0
Fix bug Shibboleth server does not recognize maintenance mode 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:45:45 +02:00
davigonz
412ce69fcb
Fix bug maintenance mode in share view 2017-05-12 15:45:45 +02:00
davigonz
f38e0e12a0
Fix bug maintenance mode message in uploads view 
# Conflicts:
#	src/com/owncloud/android/db/UploadResult.java
 2017-05-12 15:45:44 +02:00
davigonz
81baba92a0
Changed maintenance mode message 2017-05-12 15:45:44 +02:00
davigonz
1b95c2fb91
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:45:44 +02:00
davigonz
a417f2ab2b
Change dynamically the maintenance mode message with the name of the app 2017-05-12 15:45:43 +02:00
davigonz
c7ef965564
Show maintenance mode message while authenticating 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:45:43 +02:00
davigonz
ee1e47dff3
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations 2017-05-12 15:45:42 +02:00
davigonz
c47970857c
Show maintenance mode message while downloading, removing, renaming or creating folder operations 2017-05-12 15:45:42 +02:00
davigonz
ad6d867971
Show maintenance mode error in notifications while uploading a file 
# Conflicts:
#	build.gradle
#	res/values/strings.xml
 2017-05-12 15:45:42 +02:00
Mario Đanić
5aaad6a723 Merge pull request #986 from nextcloud/sharingBug 
Do nothing if sharee already exists
 2017-05-12 15:41:46 +02:00
Tobias Kaminsky
b98beaf0ef Merge branch 'master' into setAsWallpaper 2017-05-12 15:18:52 +02:00
tobiaskaminsky
01761718d9
handle Nougat and wallpaper app 2017-05-12 15:17:16 +02:00
tobiaskaminsky
58c9a7ddc7
remove authority cache 2017-05-12 15:03:34 +02:00
tobiaskaminsky
d50ee0085d
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper 2017-05-12 15:02:11 +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
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
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ć
d897b38dd8 Merge pull request #958 from nextcloud/newDrone 
use drone for all flavours
 2017-05-09 14:01:58 +02: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
Mario Danic
e90b3288f3 Fix push things 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-08 15:47:20 +02:00
Nextcloud bot
5dc5863af3
[tx-robot] updated from transifex 2017-05-08 00:21:53 +00: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
Nextcloud bot
2705f3e116
[tx-robot] updated from transifex 2017-05-05 00:21:30 +00: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
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
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
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
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
Tobias Kaminsky
9e2f33f650 Merge pull request #935 from nextcloud/simplify-gplay-flavour 
Simplify gplay flavour
 2017-05-03 11:09:52 +02:00
Andy Scherzinger
68e15fc65e Merge pull request #934 from nextcloud/fix-push-refactor-leftover 
Fix leftover
 2017-05-03 09:27:14 +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 Danic
5711f6f0b4 Simplify gplay flavour 2017-05-03 05:59:34 +02:00
Mario Danic
ec5b97f07a Fix leftover 2017-05-03 05:49:41 +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ć
96cd46e34d Merge pull request #913 from nextcloud/customBuildIndependent 
make custom build 100% independent
 2017-04-30 19:53:16 +02: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
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
1f67a9ae14
change log_name 2017-04-29 09:04:40 +02:00
tobiasKaminsky
fb025d17d0
db name also "custom" 2017-04-29 09:03:41 +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
fa84532da7
make custom build 100% independent 2017-04-28 15:05:50 +02: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
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
tobiasKaminsky
50ffaaa993
- rename zstore to gplay 
- only one build.gradle, but with commented lines for gplay/modified
 2017-04-28 09:26:16 +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
b0eb6039fb Codacy fix 2017-04-26 22:00:58 +02:00
Mario Danic
52e2c42df5 Disable analytics in gplay edition too 2017-04-26 21:59:46 +02: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