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
|
a544a0cfb6
|
correct copyright info
|
2015-08-20 13:08:28 +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 |
|
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 |
|
Andy Scherzinger
|
a393531774
|
visual fix for Progress DialogFragment(s)
|
2015-08-18 13:08:58 +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
|
ba80646e4e
|
Fix for 4.0 file action context menu (re-implement it via DialogFragment)
|
2015-08-17 15:58:03 +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
|
71f68b4c8c
|
fix for progressbars on pre lollipop and post ics for seekbar thumbs
|
2015-08-14 18:55:31 +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
|
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
|
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 |
|
Jenkins for ownCloud
|
c19bb85a24
|
[tx-robot] updated from transifex
|
2015-08-11 01:13:39 -04:00 |
|
Andy Scherzinger
|
275028a5e3
|
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
|
2015-08-10 13:01:40 +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
|
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 |
|
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 |
|