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 |
|
alejandro
|
f555d75460
|
Add Load Contact in Background and ProgressBar
Fixing Comparator
Format code
|
2017-05-27 20:52:32 +02:00 |
|
alejandro
|
c01820edc4
|
Fix Sort Contact
Avoid duplicate contacts
|
2017-05-27 20:52:29 +02:00 |
|
Nextcloud bot
|
b6c592a067
|
[tx-robot] updated from transifex
|
2017-05-27 00:26:51 +00:00 |
|
Mario Đanić
|
991b11050c
|
Merge pull request #1015 from nextcloud/quotaInSideBar
Add possibility to move quota to navigation header
|
2017-05-27 00:42:51 +02:00 |
|
tobiasKaminsky
|
9dc3229f31
|
add possibility to move quota to navigation header
|
2017-05-26 17:35:55 +02:00 |
|
Mario Đanić
|
32c3cb5968
|
Merge pull request #1030 from nextcloud/colorFolderNew
[Branding] Use color for folders, ...
|
2017-05-26 17:05:41 +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 |
|
Mario Đanić
|
3fdf5e283d
|
Merge pull request #1042 from nextcloud/lintConfig
Remove non existing reference to lint config
|
2017-05-24 15:21:32 +02:00 |
|
AndyScherzinger
|
6291113f12
|
fix comment and shorten calls
|
2017-05-24 15:07:13 +02:00 |
|
tobiasKaminsky
|
7dc5cc7a94
|
remove non existing reference to lint config
|
2017-05-24 11:36:24 +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 |
|
Mario Đanić
|
a5329a6aa7
|
Merge pull request #1019 from nextcloud/npeInContactBackups
NPE in contact backups
|
2017-05-24 00:54:28 +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ć
|
6a46fc984c
|
Merge pull request #1016 from nextcloud/storeLintOutput
Store lint output in nextcloud
|
2017-05-24 00:53:05 +02:00 |
|
tobiaskaminsky
|
306d0db533
|
fixed relative paths
|
2017-05-24 00:52:41 +02:00 |
|
tobiaskaminsky
|
6bc48fdb34
|
store lint output in nextcloud
|
2017-05-24 00:52:41 +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 |
|
Mario Đanić
|
55f346a1ad
|
Merge pull request #1010 from nextcloud/codacy
Further codacy fixes
|
2017-05-24 00:10:02 +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 |
|
Mario Đanić
|
b89ee5219a
|
Merge pull request #1035 from nextcloud/fix143DroneBuild
align app version code/name throughout builds (1.4.3)
|
2017-05-23 23:55:03 +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 |
|