Andy Scherzinger
8f0ea82efd
Fix for #1182 on Android 5
2015-10-05 18:44:50 +02:00
Jenkins for ownCloud
eddd3aa450
[tx-robot] updated from transifex
2015-10-04 01:13:38 -04:00
Jenkins for ownCloud
f056247e75
[tx-robot] updated from transifex
2015-10-03 01:13:37 -04:00
Wikinaut
cf063bf04a
fix #1024 show cert fingerprints when adding new account w/ untrusted cert
...
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
instead of signature hex dump
when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
2015-10-02 02:39:10 +02:00
masensio
8f67624a4f
Fix: Long press menu shows two extra options: old cancel download and old cancel upload
2015-10-01 10:37:37 +02:00
masensio
9494620cc4
Merge branch 'master' into sync_full_folder
...
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java
2015-09-30 12:24:01 +02:00
masensio
8090269d55
Merge branch 'master' of github.com:owncloud/android
...
Conflicts:
CHANGELOG.md
2015-09-30 10:49:47 +02:00
Jenkins for ownCloud
b6c5188fd0
[tx-robot] updated from transifex
2015-09-29 01:13:58 -04:00
masensio
4316d7082f
Remove strings for values-en_DE
2015-09-28 13:57:22 +02:00
masensio
ee9aa68d23
Merge branch 'release-1.8'
2015-09-28 12:33:47 +02:00
Jenkins for ownCloud
9a3872d003
[tx-robot] updated from transifex
2015-09-28 02:33:53 -04:00
Andy Scherzinger
917039411c
added a divider to the bottom part
2015-09-27 20:43:18 +02:00
Andy Scherzinger
2ffdb4db00
16dp right and left for checkpoxed
2015-09-27 20:32:44 +02:00
Andy Scherzinger
35a68aa337
custom list preference implementation for visual material consistency on pre-lollipop
2015-09-27 20:21:09 +02:00
tobiasKaminsky
57862ef52c
added 16dp padding
2015-09-25 17:30:30 +02:00
tobiasKaminsky
ff5202a5f6
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles
2015-09-25 17:23:31 +02:00
tobiasKaminsky
19bc90bf56
default value: do nothing
...
show summary for behaviour
2015-09-25 17:21:58 +02:00
Andy Scherzinger
5417b2a4e5
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
2015-09-25 16:09:01 +02:00
David A. Velasco
056b7c964d
Updated error message for failed folder synchronization ('download' not anymore)
2015-09-25 15:13:59 +02:00
David A. Velasco
e6c1454458
Persist conflicts in local database and show with an icon in the list of files
2015-09-25 15:13:46 +02:00
David A. Velasco
9b5506f81e
Join cancelation of downloads and uploads in 'cancel sync', both for files and folders
2015-09-25 15:13:41 +02:00
David A. Velasco
e885c78dc7
Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside
2015-09-25 15:13:38 +02:00
David A. Velasco
ac685690a2
Extend SyncFolderOperation to check local changes of all files and trigger uploads
2015-09-25 15:13:35 +02:00
David A. Velasco
a38461aaa5
Same style for log-in buttons in potrait and landscape
2015-09-25 13:54:53 +02:00
David A. Velasco
c44ed4980c
Fixed lost background color for icon in login view
2015-09-25 11:11:46 +02:00
tobiasKaminsky
5034e42928
extracted hard-coded string to string resource
2015-09-23 19:49:01 +02:00
Andy Scherzinger
66aede2b3c
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-22 10:01:14 +02:00
Jenkins for ownCloud
92c39be013
[tx-robot] updated from transifex
2015-09-22 01:13:44 -04:00
tobiasKaminsky
2b6a61ddae
#819 part3: When uploading from filesystem inside the owncloud app, show question
2015-09-21 09:45:20 +02:00
tobiasKaminsky
a64308f382
wip
2015-09-21 09:03:09 +02:00
tobiasKaminsky
a1b2655d85
wip
2015-09-21 08:57:00 +02:00
Jenkins for ownCloud
664450a6bf
[tx-robot] updated from transifex
2015-09-21 01:13:34 -04:00
tobiasKaminsky
4b8a5a9c92
#819 , part 2: Instant uploads, depends on setting
2015-09-19 14:33:29 +02:00
Andy Scherzinger
eb7bcfbd2e
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
owncloud-android-library
res/layout-land/account_setup.xml
2015-09-17 15:39:27 +02:00
Andy Scherzinger
f6b2b856cb
Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192
2015-09-17 11:46:37 +02:00
Jenkins for ownCloud
0cb5cee031
[tx-robot] updated from transifex
2015-09-17 01:13:47 -04:00
Andy Scherzinger
bbbb7026b4
fix for refrsh icon in text view in landscape mode
2015-09-16 17:34:29 +02:00
Andy Scherzinger
549284e4f9
fix click listener
2015-09-16 17:31:27 +02:00
Andy Scherzinger
044c597e2b
fix for refresh bug
2015-09-16 17:21:53 +02:00
Andy Scherzinger
94bc0699ac
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
fixed realignment item badges
Conflicts:
res/layout/list_item.xml
2015-09-16 16:27:47 +02:00
masensio
459bd1e9d0
Merge pull request #1157 from owncloud/fix_file_list_icon_alignment
...
center aligned the folder icon with the drawer icon
2015-09-16 12:34:30 +02:00
Andy Scherzinger
4c0371f82b
center aligned the folder icon with the drawer icon
2015-09-16 11:41:37 +02:00
masensio
359ede5fdd
Merge pull request #1149 from owncloud/new_filetype_icons
...
New icon detection in general + support for additional mimetype icons
2015-09-16 11:39:26 +02:00
Andy Scherzinger
9e15d2459d
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons
2015-09-15 18:44:49 +02:00
Andy Scherzinger
6f5cb9aaca
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-15 18:43:48 +02:00
David A. Velasco
eaf249803c
Removed unneeded LDPI drawables
2015-09-15 18:08:00 +02:00
David A. Velasco
0290523c03
Added icons for file type TEXT
2015-09-15 18:07:59 +02:00
Andy Scherzinger
3ff4d6df0f
adapting web's way of choosing icons
2015-09-15 18:02:34 +02:00
Jenkins for ownCloud
9b8b29d98b
[tx-robot] updated from transifex
2015-09-14 01:13:43 -04:00
Jenkins for ownCloud
83eed1a8d8
[tx-robot] updated from transifex
2015-09-12 01:13:45 -04:00
Andy Scherzinger
6eccdc25b3
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
2015-09-11 13:06:14 +02:00
Andy Scherzinger
13a73dd568
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-11 12:47:01 +02:00
David A. Velasco
7182b1d2b1
Merge pull request #1141 from owncloud/559_longpress_filename
...
Show file name in the contextual menu, see #559
2015-09-11 12:37:04 +02:00
Jenkins for ownCloud
7ae7cef2b3
[tx-robot] updated from transifex
2015-09-11 01:13:42 -04:00
Marc Plano-Lesay
b4875c69cc
Add additional filetype icons
2015-09-09 23:30:09 +02:00
Andy Scherzinger
0234ca22ea
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-09 11:42:11 +02:00
masensio
84a4a086d6
Merge pull request #1124 from Kernald/new-filetype-icons
...
New filetype icons
2015-09-09 08:50:50 +02:00
Jenkins for ownCloud
fbe533c974
[tx-robot] updated from transifex
2015-09-09 01:13:45 -04:00
Andy Scherzinger
ed86a0560a
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-08 13:50:02 +02:00
Jenkins for ownCloud
1d4b191fb3
[tx-robot] updated from transifex
2015-09-08 01:13:44 -04:00
Andy Scherzinger
e9f793755e
showing the filename in the long press menu on file list, see #559
2015-09-07 12:24:01 +02:00
Andy Scherzinger
6d670fb678
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-07 11:16:29 +02:00
masensio
1586eea7cb
Merge branch 'master' into text_file_preview_pr_707_with_develop
2015-09-07 10:42:09 +02:00
David A. Velasco
1ff57e0665
HOT FIX: recovered lost strings
2015-09-07 10:07:54 +02:00
Jenkins for ownCloud
244f3bd4e4
[tx-robot] updated from transifex
2015-09-07 01:13:41 -04:00
Andy Scherzinger
c1e73ec56f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-06 20:49:49 +02:00
Jenkins for ownCloud
5ceecb4a82
[tx-robot] updated from transifex
2015-09-06 01:13:44 -04:00
Jenkins for ownCloud
11c0d77648
[tx-robot] updated from transifex
2015-09-05 01:13:44 -04:00
masensio
fc5c4d899c
Merge branch 'master' into text_file_preview_pr_707_with_develop
...
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-09-04 14:31:10 +02:00
Andy Scherzinger
e7674368e2
fix duplicate
2015-09-04 13:24:12 +02:00
Andy Scherzinger
7ac2a0d297
fix layout/uploader_layout.xml
2015-09-04 13:20:41 +02:00
Andy Scherzinger
32145d57db
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/uploader_layout.xml
2015-09-04 13:16:11 +02:00
masensio
f787213cd1
Merge pull request #1102 from owncloud/copy
...
Copy files
2015-09-04 11:14:42 +02:00
Jenkins for ownCloud
f70de1736e
[tx-robot] updated from transifex
2015-09-04 01:13:40 -04:00
masensio
a0707428ff
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
...
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2015-09-02 13:23:42 +02:00
Jenkins for ownCloud
2b001a8bf2
[tx-robot] updated from transifex
2015-09-02 07:06:14 -04:00
Jenkins for ownCloud
f70817f5fb
[tx-robot] updated from transifex
2015-09-01 13:02:18 -04:00
David A. Velasco
e6be60679f
Merge branch 'master' into copy
...
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
2015-09-01 18:35:51 +02:00
Marc Plano-Lesay
502ff0a216
Use new filetype icons
2015-08-31 19:17:05 +02:00
David A. Velasco
136db6a765
Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader
...
'Create folder' button moved to action bar in Uploader activity
2015-08-31 17:48:12 +02:00
Jenkins for ownCloud
ef7cf6edb0
[tx-robot] updated from transifex
2015-08-31 01:13:46 -04:00
Jenkins for ownCloud
11fa921860
[tx-robot] updated from transifex
2015-08-28 01:13:40 -04:00
Jenkins for ownCloud
6b8a052a5e
[tx-robot] updated from transifex
2015-08-27 01:13:43 -04:00
Jenkins for ownCloud
8ecfdfe614
[tx-robot] updated from transifex
2015-08-26 01:13:41 -04:00
masensio
b81de1d547
Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
...
Conflicts:
res/layout/uploader_layout.xml
2015-08-25 14:53:42 +02:00
Jenkins for ownCloud
8f0a83a495
[tx-robot] updated from transifex
2015-08-25 01:13:43 -04:00
Jenkins for ownCloud
573b9d1727
[tx-robot] updated from transifex
2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
806f258bbd
[tx-robot] updated from transifex
2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
763ecd2d84
[tx-robot] updated from transifex
2015-08-24 12:38:29 +02:00
Jenkins for ownCloud
9448a809b1
[tx-robot] updated from transifex
2015-08-24 12:38:28 +02:00
tobiasKaminsky
8e3787909f
Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
2015-08-21 17:48:58 +02:00
Andy Scherzinger
fd39e9168b
replaced the icons and header coloring
2015-08-21 17:32:24 +02:00
Andy Scherzinger
18811141fb
added delete icon files
2015-08-21 17:09:18 +02:00
masensio
3c2da890ce
Merge branch 'master' into reliable_uploads
2015-08-21 13:09:54 +02:00
Jenkins for ownCloud
632f3d23e0
[tx-robot] updated from transifex
2015-08-21 01:13:44 -04:00
masensio
3e6bcda9a4
Merge branch 'develop' into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2015-08-20 16:37:10 +02:00
Andy Scherzinger
d24b396d54
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-20 13:50:44 +02:00
Andy Scherzinger
a544a0cfb6
correct copyright info
2015-08-20 13:08:28 +02:00
Andy Scherzinger
7f13b98cc0
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
2015-08-18 23:20:01 +02:00
Andy Scherzinger
cbb0f8743f
Fix for long click menue for account management in preferences screen
2015-08-18 23:13:10 +02:00
Andy Scherzinger
dbed65610b
fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle
2015-08-18 22:09:53 +02:00
Andy Scherzinger
da89715045
reverted back to light colored login
2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76
Added error messages for copy action. English only.
2015-08-18 17:04:47 +02:00
masensio
e5e5b3638c
Merge branch 'develop' into reliable_uploads
...
Conflicts:
SETUP.md
owncloud-android-library
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/db/DbHandler.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/ComponentsGetter.java
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-08-18 15:14:37 +02:00
Andy Scherzinger
e79f92f566
Conflict Dialog Fix
2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94
Added error messages for copy action. English only.
2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8
Added copy action
2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774
visual fix for Progress DialogFragment(s)
2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano
f4432afdeb
Added 'Copy' action
2015-08-18 10:58:37 +02:00
Andy Scherzinger
c13741ba20
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 16:14:12 +02:00
Andy Scherzinger
3a82db451c
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
2015-08-17 16:13:30 +02:00
Andy Scherzinger
b669bd7737
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 16:04:17 +02:00
Andy Scherzinger
ba80646e4e
Fix for 4.0 file action context menu (re-implement it via DialogFragment)
2015-08-17 15:58:03 +02:00
Andy Scherzinger
16a5bdc8d1
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 09:05:33 +02:00
Andy Scherzinger
80e7836840
set back font weight on drawer list items
2015-08-17 09:04:37 +02:00
Jenkins for ownCloud
ba4b258697
[tx-robot] updated from transifex
2015-08-17 01:13:37 -04:00
Jenkins for ownCloud
d09baff068
[tx-robot] updated from transifex
2015-08-15 01:13:39 -04:00
Andy Scherzinger
267179ef2e
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-14 18:55:58 +02:00
Andy Scherzinger
71f68b4c8c
fix for progressbars on pre lollipop and post ics for seekbar thumbs
2015-08-14 18:55:31 +02:00
Andy Scherzinger
a7859b4ab4
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/drawer.xml
res/layout/drawer_list_item.xml
res/values/styles.xml
2015-08-14 17:45:22 +02:00
Andy Scherzinger
92af92ee3b
merged part of the fixes from material buttons branch to fix bugs reported in PR #1076
2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8
fixed drawer font size, changed color according to material guide
2015-08-14 16:00:35 +02:00
Andy Scherzinger
9d08a3f306
fix for drawer width
2015-08-14 15:40:22 +02:00
Andy Scherzinger
abb6e2dbd5
Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices
2015-08-14 15:29:22 +02:00
Andy Scherzinger
607fb6f587
group change data and size together and calculate decimals based on total size see comment in PR #1090
2015-08-14 10:05:26 +02:00
Andy Scherzinger
c86e92870f
fixed padding of list items
2015-08-14 00:34:12 +02:00
Andy Scherzinger
927ce968d7
fixed progress wheel
2015-08-13 19:43:56 +02:00
Andy Scherzinger
f17011ff68
some more styling for the log screen
2015-08-13 19:05:20 +02:00
Andy Scherzinger
5b92747895
standard material paddings set
2015-08-13 18:39:53 +02:00
Andy Scherzinger
64910f59bb
fixed checkbox (now also material design on pre lollipop)
2015-08-13 18:39:36 +02:00
Andy Scherzinger
8a8eb435a3
set standard 16dp whitespaces via config values not hardcoded
2015-08-13 18:08:21 +02:00
Andy Scherzinger
ba3bc9cbfd
minor padding change on logo
2015-08-13 17:54:58 +02:00
Andy Scherzinger
af2af7198b
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/ssl_untrusted_cert_layout.xml
res/layout/ssl_validator_layout.xml
2015-08-13 15:57:38 +02:00
Andy Scherzinger
60e0f09278
Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons
2015-08-13 15:41:59 +02:00
Jenkins for ownCloud
a244bdf1ca
[tx-robot] updated from transifex
2015-08-13 01:13:38 -04:00
Andy Scherzinger
f7d6939264
fix for text field focus colors
2015-08-12 19:12:56 +02:00
Andy Scherzinger
05ca0270a8
fixed button style blue/grey
2015-08-12 18:54:27 +02:00
Andy Scherzinger
5257af90bc
fixed username to be single line and ellipsized in case of lang names
2015-08-12 18:48:33 +02:00
Jenkins for ownCloud
c4b639e964
[tx-robot] updated from transifex
2015-08-12 01:13:37 -04:00
masensio
eda6f71491
Move create folder button to action bar in Uploader
2015-08-11 11:14:26 +02:00
Jenkins for ownCloud
c19bb85a24
[tx-robot] updated from transifex
2015-08-11 01:13:39 -04:00
Andy Scherzinger
6809e4a9de
16dp spacing for the footer too
2015-08-10 18:50:24 +02:00
Andy Scherzinger
e22b547401
further 16dp spacings
2015-08-10 18:36:50 +02:00
Andy Scherzinger
c085ffd545
inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes
2015-08-10 18:32:25 +02:00
Andy Scherzinger
275028a5e3
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
2015-08-10 13:01:40 +02:00
Andy Scherzinger
6a22a8cd3b
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-08-10 10:54:05 +02:00
Jenkins for ownCloud
2b79f3292f
[tx-robot] updated from transifex
2015-08-10 01:13:35 -04:00
Jenkins for ownCloud
2206585f52
[tx-robot] updated from transifex
2015-08-09 01:13:36 -04:00
Jenkins for ownCloud
5258172ffd
[tx-robot] updated from transifex
2015-08-08 01:13:38 -04:00
Andy Scherzinger
a3ccc6a559
fix for the button styling (land)
2015-08-07 18:05:50 +02:00
Andy Scherzinger
f4445284d0
material checkbox drawables instead of version dependend ones
2015-08-07 18:05:34 +02:00
Andy Scherzinger
bbfb414695
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-08-07 17:11:04 +02:00
Andy Scherzinger
4a4296a07e
Material Buttons (draft)
2015-08-07 17:09:47 +02:00
Jenkins for ownCloud
8d4d1bfffb
[tx-robot] updated from transifex
2015-08-07 04:57:36 -04:00
Jenkins for ownCloud
e935e9239d
[tx-robot] updated from transifex
2015-08-07 01:13:50 -04:00
Andy Scherzinger
ddd01569cd
Optimized translucence for lollipop on image preview
2015-08-06 19:14:52 +02:00
Andy Scherzinger
6b6227125b
added back translucent action bar for image preview
2015-08-06 19:04:22 +02:00
Andy Scherzinger
9d9efd1c1d
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
...
Conflicts:
owncloud-android-library
2015-08-06 17:23:02 +02:00
Andy Scherzinger
a257935b8c
Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency
2015-08-06 17:13:00 +02:00
Andy Scherzinger
1ce7d79ff0
Move alert dialog to material variant and setting the correct accent color for the button texts via styles
2015-08-06 16:27:56 +02:00
purigarcia
91000ba405
change the subject
2015-08-06 10:23:27 +02:00
Jenkins for ownCloud
e0594d4005
[tx-robot] updated from transifex
2015-08-06 01:14:11 -04:00
masensio
b694fee63d
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
...
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-08-05 16:48:12 +02:00
Andy Scherzinger
270fea6a33
fix for the grid footer
2015-08-05 15:21:05 +02:00
Andy Scherzinger
b276b623a9
added bottom padding to logo, logo slightly bigger
2015-08-05 14:48:04 +02:00
Andy Scherzinger
5ded9e818b
aligned account name with menu items
2015-08-05 14:07:00 +02:00
Andy Scherzinger
c2418d24d5
added missing progressbar
2015-08-05 13:43:23 +02:00
Andy Scherzinger
97b9932d81
changed color for hint text on login screens to 777
2015-08-05 13:36:12 +02:00
Andy Scherzinger
b5f8c0b087
changed alignment of drawer's content according to jan's suggestions
2015-08-04 19:02:36 +02:00
Andy Scherzinger
e36349f77e
fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment
2015-08-04 18:32:33 +02:00
David A. Velasco
156cb5e81b
Updated conflict message (same as in web app)
2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578
extracted color values for download fragment, see comments 172c3f56a3
2015-08-04 17:06:27 +02:00
Andy Scherzinger
a329d49ddf
Fix for color reference in portrait 8f401a38d8 (comments)
2015-08-04 16:49:20 +02:00
Andy Scherzinger
10c5498879
extracted text colors for account setup to color.xml, see e72caebbce comments
2015-08-04 16:41:53 +02:00
tobiasKaminsky
d2df3f9b33
re-added values-tzl
2015-08-04 12:39:58 +02:00
tobiasKaminsky
c907f6a742
Partially revert 50819ce
2015-08-04 12:39:57 +02:00
tobiasKaminsky
1327ce7315
renamed string values
2015-08-04 12:39:56 +02:00
Andy Scherzinger
3c78d4fcfb
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
2015-08-04 11:47:44 +02:00
Jenkins for ownCloud
74d5911e56
[tx-robot] updated from transifex
2015-08-04 01:14:04 -04:00
Andy Scherzinger
6235022b56
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
2015-08-03 21:38:32 +02:00
Jenkins for ownCloud
519ba0393c
[tx-robot] updated from transifex
2015-07-31 01:14:01 -04:00
Jenkins for ownCloud
bacebffeb7
[tx-robot] updated from transifex
2015-07-30 01:14:02 -04:00
Jenkins for ownCloud
28284da055
[tx-robot] updated from transifex
2015-07-29 01:14:04 -04:00
Jenkins for ownCloud
2ac67e5e06
[tx-robot] updated from transifex
2015-07-28 01:14:02 -04:00
AndyScherzinger
bfea14e876
setting the username on the drawer header for startup and coming back from the preferences screen for account switching
2015-07-27 20:20:46 +02:00
AndyScherzinger
c49fbfb02c
adding a new accent color see #1076 comment by @jancborchardt
2015-07-27 16:34:16 +02:00
AndyScherzinger
687318e549
changing the logo padding top/bottom according to #1076 comment by @jancborchardt
2015-07-27 16:33:36 +02:00
AndyScherzinger
8c0376229e
changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076
2015-07-27 16:33:10 +02:00
AndyScherzinger
ff2d55cede
replaced hard coded background color with coresponding color-definition
2015-07-27 16:18:53 +02:00
AndyScherzinger
172c3f56a3
colored background black for image download #710 as proposed by @jancborchardt
2015-07-27 01:00:51 +02:00
AndyScherzinger
77457f276f
adding material icons to resolutions < xxhdpi
2015-07-26 19:40:31 +02:00
AndyScherzinger
0a3b4c80c2
progress bar drawable definitions (forgot to commit earlier)
2015-07-26 18:36:29 +02:00
AndyScherzinger
e72caebbce
fine tuning icon work on login screen, making landscape visually en par with portrait mode
2015-07-26 18:36:00 +02:00
AndyScherzinger
49b3acd2be
added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore
2015-07-26 17:52:29 +02:00
AndyScherzinger
0c3e198e77
download fixing for #710
2015-07-26 02:54:03 +02:00
AndyScherzinger
35b971de10
further xxxhdpi cion work
2015-07-26 02:11:15 +02:00
AndyScherzinger
8f401a38d8
redone color changes for login screen
2015-07-26 02:10:51 +02:00
AndyScherzinger
d474239b21
initial material design changes for the action bar
2015-07-26 01:49:27 +02:00
Jenkins for ownCloud
82f4123260
[tx-robot] updated from transifex
2015-07-25 01:13:46 -04:00
Jenkins for ownCloud
3d18b6b207
[tx-robot] updated from transifex
2015-07-24 01:14:12 -04:00
