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
|
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 |
|