mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 00:34:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
8216 commits 220 branches 1588 tags 639 MiB
Commit graph

4794 commits

Author SHA1 Message Date
tobiasKaminsky
db22cf5bb4
ManageAccountActivity: change color of font and active icon in accounts list 2017-06-13 11:13:04 +02:00
tobiasKaminsky
b5643f90a2
color toolbar & progress bar 2017-06-13 09:48:22 +02:00
tobiasKaminsky
2ed50a3317
use solid color if a hex color is provided instead of an url in user info activity 2017-06-13 09:02:05 +02:00
tobiasKaminsky
cc32bd28fb
FAB color 2017-06-13 08:41:03 +02:00
tobiasKaminsky
aeee5599d0
use solid color if a hex color is provided instead of an url 2017-06-12 15:04:42 +02:00
tobiasKaminsky
03f5022104
preserve aspect ratio in user info activity 2017-06-12 14:31:07 +02:00
tobiasKaminsky
2bcff533b9
use server slogan on every occurrence 2017-06-12 14:30:33 +02:00
Nextcloud bot
6c76c26bc1
[tx-robot] updated from transifex 2017-06-12 00:25:59 +00:00
Mario Đanić
535e5d1ec3 Merge pull request #1073 from imjarp/logoffRemoveUploads 
Removing uploads from account when logout
 2017-06-08 04:37:02 +02:00
Nextcloud bot
6ee38c739b
[tx-robot] updated from transifex 2017-06-08 00:27:39 +00:00
AndyScherzinger
a9fa536fb3
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-07 22:33:59 +02:00
JARP
f7ce3e9ab5 Removing uploads from account 2017-06-07 15:27:03 -05:00
tobiasKaminsky
f951c199ef
partially color primary and primary_dark working 2017-06-07 09:33:12 +02:00
tobiasKaminsky
fdfc4951e8
use server slogan if present when browsing root folder 2017-06-07 09:33:12 +02:00
tobiasKaminsky
a557c26d50
use background image also an user info 2017-06-07 09:33:12 +02:00
tobiasKaminsky
2b5507592f
change progress color 2017-06-07 09:33:11 +02:00
tobiasKaminsky
d84c13a176
use background image from theming app in drawer 2017-06-07 09:33:11 +02:00
tobiasKaminsky
b72d900d7d
add server name & color 2017-06-07 09:33:11 +02:00
alejandro
9043685c18 Fixing title bar 2017-06-07 08:39:08 +02:00
Nextcloud bot
a25f953b6e
[tx-robot] updated from transifex 2017-06-07 00:29:26 +00:00
AndyScherzinger
bb7c065b1e
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-06 17:32:00 +02:00
Mario Danic
ee2d09be97 Fix a typo 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 13:27:16 +02:00
Mario Danic
d0692f72f4 Fix ui when not using account choose 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 13:24:05 +02:00
Mario Danic
b530d38b07 Add various customization options 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 11:32:29 +02:00
Nextcloud bot
962c5bee7e
[tx-robot] updated from transifex 2017-06-06 00:27:03 +00:00
Nextcloud bot
9ec47db602
[tx-robot] updated from transifex 2017-06-05 00:26:28 +00:00
AndyScherzinger
de8bb6a691
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2017-06-05 00:38:52 +02:00
Nextcloud bot
3ac9c40469
[tx-robot] updated from transifex 2017-06-04 00:27:38 +00:00
Nextcloud bot
3de6aa9b51
[tx-robot] updated from transifex 2017-06-03 00:25:35 +00:00
Nextcloud bot
1e66a8235a
[tx-robot] updated from transifex 2017-06-02 00:27:31 +00:00
Nextcloud bot
22044ec663
[tx-robot] updated from transifex 2017-06-01 00:25:29 +00:00
AndyScherzinger
265d6ced52
scope members 2017-05-31 22:09:26 +02:00
AndyScherzinger
dd54aa7207
Merge branch 'master' of https://github.com/nextcloud/android into fixingContactBackup 2017-05-31 21:55:31 +02:00
Andy Scherzinger
ce3a8bf3d7 Merge pull request #1012 from nextcloud/activitiesImprovement 
Activities improvement
 2017-05-31 21:25:19 +02:00
tobiasKaminsky
b2094cdc8d disable search related navigation entries in sidebar/bottombar if server version is <12 2017-05-31 18:59:52 +02:00
Mario Danic
9631859548 Fix time 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-31 18:52:12 +02:00
AndyScherzinger
29bd72141d
corrected left icon size to file_icon_size 2017-05-31 12:52:13 +02:00
Mario Danic
0f53e5043f
Hopefully add support for pre-12 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-31 11:02:25 +02:00
Mario Danic
7ebc48b2bb
Fix UI 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-31 11:02:25 +02:00
AndyScherzinger
73b0af94f4
use new icon util method for custom color aware tinted icon 2017-05-31 11:02:25 +02:00
alejandro
1d92fe8df6
Removing RecyclerView 2017-05-31 11:02:24 +02:00
alejandro
1cf2ef4395
Fixing comments 2017-05-31 11:02:24 +02:00
alejandro
28b8993f88
Fixing Codacy 2017-05-31 11:02:23 +02:00
alejandro
13f1b56e78
Fixing OCClient 2017-05-31 11:02:23 +02:00
alejandro
0f36ce9485
Adding RichObject to Activity View 2017-05-31 11:02:23 +02:00
alejandro
2e6953064a
Custom Fetcher with OCClient for Glide 2017-05-31 11:02:23 +02:00
alejandro
40b4d3de55
Improvement RichObject 2017-05-31 11:02:22 +02:00
alejandro
e62b4eae04
Rich Text and clickable text was added 2017-05-31 11:02:22 +02:00
alejandro
fba1d38100
Header was added in ActivitiesView 
RichSubject was Added
 2017-05-31 11:02:19 +02:00
Nextcloud bot
a9a72106ee
[tx-robot] updated from transifex 2017-05-31 00:26:39 +00:00
alejandro
f0b76ede44 Add Load Contact in Background and ProgressBar 
Fixing Comparator

Format code
 2017-05-30 16:18:16 -05:00
alejandro
d1f7e2aa5f Fix Sort Contact 
Avoid duplicate contacts
 2017-05-30 16:15:05 -05:00
AndyScherzinger
bdcbbb13c5
slightly enlarge autoUpload on/off button hitbox 2017-05-30 08:41:16 +02:00
tobiasKaminsky
400912e961
fixed cick on wifi 2017-05-30 08:41:16 +02:00
tobiasKaminsky
328b6625ab
change auto upload path to "/Auto Upload" 2017-05-30 08:41:15 +02:00
tobiasKaminsky
7103fea76d
changed to default 
only "on wifi" is in settings
 2017-05-30 08:41:15 +02:00
tobiasKaminsky
ab096dd0f7
background logic implemented 2017-05-30 08:40:55 +02:00
Andy Scherzinger
0112219dd3 Merge pull request #1050 from nextcloud/comradekingu-patch-1 
Spelling: "Login" is not a verb. + ": Uppercase"
 2017-05-30 07:46:05 +02:00
Nextcloud bot
04d7b6895c
[tx-robot] updated from transifex 2017-05-30 00:27:06 +00:00
Mario Đanić
343b65645c Merge pull request #1041 from nextcloud/authInNC12 
Multiple auth headers in NC12
 2017-05-29 23:50:23 +02:00
AndyScherzinger
1b6dc03872
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles 2017-05-29 21:42:51 +02:00
Mario Đanić
e2f07eb2d4 Merge pull request #1011 from nextcloud/contactListImprovement 
Contact list improvement
 2017-05-29 21:15:28 +02:00
Mario Danic
fd790ecbf1 Clean imports 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 20:04:53 +02:00
Mario Danic
0b0a9e9c60 Fix majority of bugs 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 19:42:04 +02:00
Mario Danic
df69e842c6 Fix empty view on rotation 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 19:31:23 +02:00
Mario Danic
2769d51d0f Fix a few things 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 19:26:21 +02:00
comradekingu
7a7091d135 Update strings.xml 
Spelling: "Login" is not a verb. + ": Uppercase"
 2017-05-29 18:35:06 +02:00
Mario Danic
d1847a25d3 Fix a few things 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 13:34:56 +02:00
Mario Danic
c774aa3040 Partially fix stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 12:57:19 +02:00
Mario Danic
b35b1f9c90 Merge branch 'master' into searchViewWrongFiles 
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
#	src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2017-05-29 10:37:01 +02:00
Nextcloud bot
7d2b37e3ec
[tx-robot] updated from transifex 2017-05-28 00:26:08 +00:00
Nextcloud bot
b6c592a067
[tx-robot] updated from transifex 2017-05-27 00:26:51 +00:00
tobiasKaminsky
9dc3229f31
add possibility to move quota to navigation header 2017-05-26 17:35:55 +02:00
AndyScherzinger
de58c864bb
fix folder/upload icons for empty list view (Nc blue + 50% opacity) 2017-05-26 11:36:54 +02:00
AndyScherzinger
dc21800299
fix material design color definitions 2017-05-26 11:19:13 +02:00
AndyScherzinger
49453742c9
cleanup actionbar style definition 2017-05-26 11:19:13 +02:00
tobiasKaminsky
5edd32b753
removed nc_blue_accent and nc_blue and use colors from setup.xml 2017-05-26 11:19:13 +02:00
tobiasKaminsky
b3eb13c2df
removed navigation bar color and set to primary 2017-05-26 11:19:12 +02:00
tobiaskaminsky
bf4191e251
checkbox in off state: grey 
auto upload cloud icon in on state: tint it
 2017-05-26 11:19:12 +02:00
tobiasKaminsky
71a9b683fa
change auto upload cloud icon 2017-05-26 11:19:11 +02:00
tobiasKaminsky
a08a69faeb
unify tintDrawable methods 2017-05-26 11:19:11 +02:00
tobiasKaminsky
8ba192f38a
tint checkboxes 2017-05-26 11:19:11 +02:00
tobiasKaminsky
e671cecc45
WIP use colors from setup.xml for folder icons 2017-05-26 11:19:10 +02:00
Nextcloud bot
8d510e5244
[tx-robot] updated from transifex 2017-05-26 00:25:54 +00:00
Nextcloud bot
e2254cceac
[tx-robot] updated from transifex 2017-05-25 00:25:34 +00:00
AndyScherzinger
6291113f12
fix comment and shorten calls 2017-05-24 15:07:13 +02:00
tobiasKaminsky
b11ca04f8a
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement 2017-05-24 11:13:44 +02:00
tobiasKaminsky
599256d9c9
parse multiple auth headers and pick "basic" if exists 2017-05-24 10:32:18 +02:00
Nextcloud bot
7995544f6c
[tx-robot] updated from transifex 2017-05-24 00:26:32 +00:00
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
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ć
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
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
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
tobiasKaminsky
0627dd2a84
bump version 2017-05-22 17:21:37 +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
28772f1ba9
5 cols on portrait 2017-05-19 11:49:07 +02:00
tobiasKaminsky
ba14880f3d
use 10cols on landscape, 6 on portrait 2017-05-19 11:34:49 +02:00
tobiasKaminsky
1ab754278e
revert 2017-05-19 10:48:26 +02:00
tobiasKaminsky
47b5748b74
Merge remote-tracking branch 'remotes/origin/master' into pinchZoom_new 2017-05-19 10:43:50 +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
tobiaskaminsky
7eddd7440c
fixed "all files" 2017-05-18 14:34:44 +02:00
tobiaskaminsky
fabecc86a5
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement 2017-05-18 13:47:03 +02:00
Tobias Kaminsky
98989a9363 Merge 44b9355315 into 547453760e 2017-05-18 10:52:31 +00:00
tobiaskaminsky
da497abdb6
move/copy drawer icons 2017-05-18 12:20:55 +02:00
Nextcloud bot
547453760e
[tx-robot] updated from transifex 2017-05-18 00:24:19 +00:00
tobiaskaminsky
0f6f4ad642
do not send status messages if fragment is destroyed 2017-05-17 16:41:01 +02:00
tobiaskaminsky
37aac8498c
prevent NPE 
use boolean to determinate if resume or if new start
 2017-05-17 16:08:21 +02:00
tobiaskaminsky
9860aaa10f
Merge remote-tracking branch 'remotes/origin/master' into audioRotationBug 2017-05-17 15:39:28 +02:00
Tobias Kaminsky
c2010bb3d0 Merge branch 'master' into crashDueToEmptyString 2017-05-17 15:26:05 +02:00
Mario Đanić
c5af507080 Merge fd6caadc3f into 01e7112a9a 2017-05-17 11:30:59 +00:00
Mario Danic
fd6caadc3f Unify scope 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-17 13:30:29 +02:00
Mario Đanić
01e7112a9a Merge pull request #194 from nextcloud/setAsWallpaper 
Set as wallpaper/contact-photo/etc.
 2017-05-17 13:26:51 +02:00
Tobias Kaminsky
d6a1c7ee83 Merge branch 'master' into crashDueToEmptyString 2017-05-17 12:10:52 +02:00
Nextcloud bot
a79dbe78d4
[tx-robot] updated from transifex 2017-05-17 09:58:58 +00:00
Mario Danic
fc7c24b610 Fix delete 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-17 11:17:05 +02:00
Mario Danic
8b923ad8e7 Push fix 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-17 11:01:00 +02:00
Nextcloud bot
e420fac753
[tx-robot] updated from transifex 2017-05-17 00:23:49 +00:00
AndyScherzinger
9021848af6
use apply instead of commit 2017-05-16 21:50:59 +02:00
AndyScherzinger
c749f6ea32
Fix javaDoc format 2017-05-16 21:41:02 +02:00
tobiasKaminsky
4f8da57a0e
minor improvements due to android studio suggestions 2017-05-16 13:30:07 +02:00
tobiasKaminsky
5126eeac10
do not show "set picture as" for svg images 2017-05-16 13:27:16 +02:00
tobiasKaminsky
e520c5a585
fix some issues/warnings 
fix some issues/warnings

scoping back
 2017-05-16 13:14:19 +02:00
Mario Danic
05425c0444 Fix push 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-16 12:33:44 +02:00
Mario Đanić
f1c0317dce Merge pull request #1001 from nextcloud/enhanceParticipate 
Minor improvements to participate view
 2017-05-16 11:06:20 +02:00
tobiasKaminsky
852252717b
non-downloaded file will first downloaded and then used for "set as" 2017-05-16 09:48:47 +02:00
Nextcloud bot
e4e75bc7cb
[tx-robot] updated from transifex 2017-05-16 00:23:28 +00:00
tobiasKaminsky
c9fc98499f
add missing import 2017-05-15 14:18:05 +02:00
tobiasKaminsky
6c6b0465b6
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper 2017-05-15 14:08:36 +02:00
Tobias Kaminsky
cea61893a0 Merge branch 'master' into enhanceParticipate 2017-05-15 14:04:15 +02:00
Tobias Kaminsky
a2ff44a77e Merge branch 'master' into crashDueToEmptyString 2017-05-15 12:44:22 +02:00
tobiasKaminsky
ebd94e889e
use contribute url from setup.xml 
escape quote signs
 2017-05-15 11:42:28 +02:00
tobiasKaminsky
6f3c3b5579
remove all "string empty" 2017-05-15 10:27:43 +02:00
tobiasKaminsky
aeba233894
use app specific log folder 2017-05-15 09:08:19 +02:00
tobiasKaminsky
4e80906cd9
fix typo 2017-05-15 07:40:14 +02:00
tobiasKaminsky
c6c1713ec2
beautify it 2017-05-15 07:39:00 +02:00
tobiasKaminsky
3351cd4541
add string.empty 2017-05-15 07:38:19 +02:00
Nextcloud bot
0017e16748
[tx-robot] updated from transifex 2017-05-15 00:23:31 +00:00
Nextcloud bot
6db771d36a
[tx-robot] updated from transifex 2017-05-14 00:23:16 +00:00
AndyScherzinger
ff65b2b1d1
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles 2017-05-13 23:12:57 +02:00
tobiaskaminsky
c28f17d9af
remove old reference to onClick, this is now handled via ButterKnife 
use "end" instead of "right" for RTL support
 2017-05-13 22:30:00 +02:00
AndyScherzinger
1b90c742bf
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles 2017-05-13 16:20:20 +02:00
AndyScherzinger
02100ae744
remove unnecessary casts 2017-05-13 14:53:01 +02:00
AndyScherzinger
086e18d377
use apply() instead of commit() 2017-05-13 14:52:39 +02:00
AndyScherzinger
e48cc1bbbc
document empty method bodies (codacy) 2017-05-13 14:48:40 +02:00
AndyScherzinger
f2a81fcc08
fix javaDoc (lint) 2017-05-13 14:38:21 +02:00
AndyScherzinger
54b3229c6a
add missing super calls (lint) 2017-05-13 14:38:08 +02:00
AndyScherzinger
904ec2623d
remove unnecessary semicolons (lint) 2017-05-13 14:11:20 +02:00
davigonz
a480dff6ca
Read modification time from the file in local filesystem and set it to the file 
# Conflicts:
#	src/com/owncloud/android/operations/UploadFileOperation.java
 2017-05-13 14:11:04 +02:00
AndyScherzinger
f9e7c85d03
fix last modified timestamp 2017-05-13 13:55:20 +02:00
tobiasKaminsky
09f9019c9c
some minor code formatting 2017-05-13 13:50:49 +02:00
AndyScherzinger
433a281665
fix codacy warning 2017-05-13 13:50:34 +02:00
AndyScherzinger
da73fdbbe9
fix import 2017-05-13 13:50:33 +02:00
AndyScherzinger
1029a9e2e7
adaptes federated shares permission computation 2017-05-13 13:50:24 +02:00
AndyScherzinger
e9b25d0a4a
fix compile error after lib merges 
# Conflicts:
#	src/com/owncloud/android/ui/activity/ShareActivity.java
 2017-05-13 13:50:24 +02:00
David A. Velasco
448e977aca
Remove always-true component in condition, from CR 2017-05-13 13:50:14 +02:00
jabarros
bc04df153d
Fix var name in comment 2017-05-13 13:50:13 +02:00
jabarros
0e7496c233
Handle create, change and delete options in federated sharing in servers 9.1 or up 
# Conflicts:
#	src/com/owncloud/android/ui/fragment/EditShareFragment.java
 2017-05-13 13:50:13 +02:00
AndyScherzinger
c219152db5
fix codacy warning 2017-05-13 13:50:13 +02:00
AndyScherzinger
9cd963b12c
fix import 2017-05-13 13:50:12 +02:00
AndyScherzinger
8d7157d4fc
adaptes federated shares permission computation 2017-05-13 13:50:03 +02:00
AndyScherzinger
e2621389ae
fix compile error after lib merges 
# Conflicts:
#	src/com/owncloud/android/ui/activity/ShareActivity.java
 2017-05-13 13:50:02 +02:00
David A. Velasco
e93de886b1
Remove always-true component in condition, from CR 2017-05-13 13:49:52 +02:00
jabarros
73798d2196
Fix var name in comment 2017-05-13 13:49:52 +02:00
jabarros
1a189a7f3c
Handle create, change and delete options in federated sharing in servers 9.1 or up 
# Conflicts:
#	src/com/owncloud/android/ui/fragment/EditShareFragment.java
 2017-05-13 13:49:52 +02:00
AndyScherzinger
89eb8f1a49
fix codacy warning 2017-05-13 13:49:51 +02:00
AndyScherzinger
6e6e1a08b3
fix import 2017-05-13 13:49:51 +02:00
AndyScherzinger
008a974a74
adaptes federated shares permission computation 2017-05-13 13:49:41 +02:00
AndyScherzinger
335bbdb511
fix compile error after lib merges 
# Conflicts:
#	src/com/owncloud/android/ui/activity/ShareActivity.java
 2017-05-13 13:49:41 +02:00
David A. Velasco
40e0f08c79
Remove always-true component in condition, from CR 2017-05-13 13:49:05 +02:00
jabarros
c41e968e73
Fix var name in comment 2017-05-13 13:49:05 +02:00
jabarros
712b83dc0e
Handle create, change and delete options in federated sharing in servers 9.1 or up 
# Conflicts:
#	src/com/owncloud/android/ui/fragment/EditShareFragment.java
 2017-05-13 13:49:05 +02:00
AndyScherzinger
f8bd7e7a19
fix codacy warning 2017-05-13 13:49:04 +02:00
AndyScherzinger
c7e544ab77
reintroduce account for federated sharing permission 2017-05-13 13:49:04 +02:00
AndyScherzinger
915cfb4f86
fix import 2017-05-13 13:49:04 +02:00
AndyScherzinger
a24c4b5878
adaptes federated shares permission computation 2017-05-13 13:48:54 +02:00
AndyScherzinger
c1c306150f
fix compile error after lib merges 
# Conflicts:
#	src/com/owncloud/android/ui/activity/ShareActivity.java
 2017-05-13 13:48:53 +02:00
AndyScherzinger
45f5d16038
add missing code fragments 2017-05-13 13:48:22 +02:00
David A. Velasco
626e639c92
Remove always-true component in condition, from CR 2017-05-13 13:48:21 +02:00
jabarros
7c81f04a41
Fix var name in comment 2017-05-13 13:48:21 +02:00
jabarros
b969908e2b
Handle create, change and delete options in federated sharing in servers 9.1 or up 
# Conflicts:
#	src/com/owncloud/android/ui/fragment/EditShareFragment.java
 2017-05-13 13:48:18 +02:00
Andy Scherzinger
6409e22228 Merge pull request #502 from nextcloud/recognizeMaintenanceMode 
Recognize maintenance mode
 2017-05-13 13:31:41 +02:00
Nextcloud bot
d0427e78ab
[tx-robot] updated from transifex 2017-05-13 00:23:27 +00:00
AndyScherzinger
555d3cf5bd
fix duplicate method after rebase 2017-05-12 15:46:05 +02:00
AndyScherzinger
e42df5f869
Fix after rebase 2017-05-12 15:46:04 +02:00
AndyScherzinger
ae1f736db5
fix error after rebase 2017-05-12 15:46:04 +02:00
AndyScherzinger
494927e217
fix codacy warning 2017-05-12 15:46:04 +02:00
AndyScherzinger
f12cab7202
code shortening after rebase 2017-05-12 15:46:03 +02:00
davigonz
5cbf0f9b45
Fix pull request requested changes 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
#	src/com/owncloud/android/utils/ErrorMessageAdapter.java
 2017-05-12 15:46:03 +02:00
davigonz
cf53342b40
Change evaluation order to prevent calling existFile method if maintenance mode is enabled 2017-05-12 15:46:02 +02:00
davigonz
badd90ef9d
Fix bug Unsharing in maintenance mode removes the file 2017-05-12 15:46:02 +02:00
davigonz
5300d96d01
Fix bug Shibboleth server does not recognize maintenance mode 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:46:02 +02:00
davigonz
3ff3dcc62d
Fix bug maintenance mode in share view 2017-05-12 15:46:01 +02:00
davigonz
ea0b399550
Changed maintenance mode message 2017-05-12 15:46:01 +02:00
davigonz
9594835f24
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:46:00 +02:00
davigonz
bd24e3a44f
Change dynamically the maintenance mode message with the name of the app 2017-05-12 15:46:00 +02:00
davigonz
27bf6ecfc1
Show maintenance mode message while authenticating 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:46:00 +02:00
davigonz
ab0c2cd45d
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations 2017-05-12 15:45:59 +02:00
davigonz
d2ba8fe0f6
Show maintenance mode message while downloading, removing, renaming or creating folder operations 2017-05-12 15:45:59 +02:00
davigonz
ec5e81431e
Show maintenance mode error in notifications while uploading a file 
# Conflicts:
#	build.gradle
#	res/values/strings.xml
 2017-05-12 15:45:59 +02:00
AndyScherzinger
dae7bfd9b8
fix codacy warning 2017-05-12 15:45:58 +02:00
AndyScherzinger
7c62de93fd
code shortening after rebase 2017-05-12 15:45:58 +02:00
davigonz
74af772032
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:57 +02:00
davigonz
a2d11046a7
Fix bug maintenance mode in share view 2017-05-12 15:45:57 +02:00
davigonz
4a6b11e251
Fix bug maintenance mode message in uploads view 
# Conflicts:
#	src/com/owncloud/android/db/UploadResult.java
 2017-05-12 15:45:57 +02:00
davigonz
a08fe1e2c9
Changed maintenance mode message 2017-05-12 15:45:56 +02:00
davigonz
8b22e17ab2
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:45:56 +02:00
davigonz
21f4806d94
Change dynamically the maintenance mode message with the name of the app 2017-05-12 15:45:56 +02:00
davigonz
7c56163c82
Show maintenance mode message while authenticating 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:45:55 +02:00
davigonz
2238a09915
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations 2017-05-12 15:45:55 +02:00
davigonz
e2befe4c4b
Show maintenance mode message while downloading, removing, renaming or creating folder operations 2017-05-12 15:45:54 +02:00
davigonz
6b493041f1
Show maintenance mode error in notifications while uploading a file 
# Conflicts:
#	build.gradle
#	res/values/strings.xml
 2017-05-12 15:45:54 +02:00
AndyScherzinger
5e16e35f2a
fix error after rebase 2017-05-12 15:45:54 +02:00
AndyScherzinger
7b49213514
fix codacy warning 2017-05-12 15:45:53 +02:00
AndyScherzinger
0384769f2a
code shortening after rebase 2017-05-12 15:45:53 +02:00
davigonz
72aff4c622
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:52 +02:00
davigonz
501181d9a2
Change evaluation order to prevent calling existFile method if maintenance mode is enabled 2017-05-12 15:45:52 +02:00
davigonz
0b51dc9f0c
Fix bug Unsharing in maintenance mode removes the file 2017-05-12 15:45:51 +02:00
davigonz
0b77fe214b
Fix bug Shibboleth server does not recognize maintenance mode 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:45:51 +02:00
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
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ć
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
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
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
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
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
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