tobiasKaminsky
|
ed118c952a
|
Changed computing of account name color
|
2015-05-24 08:53:58 +02:00 |
|
Jenkins for ownCloud
|
6e8fab5503
|
[tx-robot] updated from transifex
|
2015-05-24 01:13:52 -04:00 |
|
tobiasKaminsky
|
293d636f3a
|
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
# Conflicts:
# gradle/wrapper/gradle-wrapper.properties
# owncloud-android-library
# res/layout-land/account_setup.xml
# res/layout/account_setup.xml
# res/layout/list_item.xml
# res/layout/uploader_list_item_layout.xml
# res/menu/main_menu.xml
# res/values/colors.xml
# res/values/strings.xml
# src/com/owncloud/android/MainApp.java
# src/com/owncloud/android/operations/SynchronizeFolderOperation.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/adapter/FileListListAdapter.java
# src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
# src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
# src/com/owncloud/android/utils/BitmapUtils.java
|
2015-05-23 07:44:16 +02:00 |
|
Jenkins for ownCloud
|
9f094c8946
|
[tx-robot] updated from transifex
|
2015-05-23 01:13:49 -04:00 |
|
Jenkins for ownCloud
|
24a6dfda9e
|
[tx-robot] updated from transifex
|
2015-05-22 01:13:49 -04:00 |
|
tobiasKaminsky
|
6d4207a06b
|
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
|
2015-05-21 21:12:44 +02:00 |
|
masensio
|
5709757b11
|
Update gradle - remove actionSherlock
|
2015-05-21 16:43:34 +02:00 |
|
masensio
|
5f2820355d
|
Merge branch 'develop' into navigation_drawer
Conflicts:
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
|
2015-05-21 09:46:59 +02:00 |
|
Jenkins for ownCloud
|
07acad20b5
|
[tx-robot] updated from transifex
|
2015-05-21 01:13:53 -04:00 |
|
masensio
|
288c148b51
|
Merge pull request #955 from owncloud/thumbnailOOM
HOTFIX: prevent OOM when scrolling Thumbnails
|
2015-05-20 11:07:14 +02:00 |
|
masensio
|
25718e7992
|
Merge branch 'develop' into navigation_drawer
|
2015-05-18 15:04:15 +02:00 |
|
David A. Velasco
|
f25acde912
|
Merge pull request #975 from owncloud/fix_refresh_large_default_storage
Updated library to reference after fixing refresh to server with unexpected quota value
|
2015-05-18 14:59:22 +02:00 |
|
David A. Velasco
|
45011ea819
|
Update library reference after merging changes in library
|
2015-05-18 14:51:21 +02:00 |
|
David A. Velasco
|
a3642ab864
|
Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale
|
2015-05-18 14:29:00 +02:00 |
|
masensio
|
a496f08717
|
Remove actionbarsherlock , replace it with Android Support Library (v7)
|
2015-05-18 12:59:46 +02:00 |
|
Jenkins for ownCloud
|
2c37b73a55
|
[tx-robot] updated from transifex
|
2015-05-18 01:13:50 -04:00 |
|
masensio
|
d43fbbac6b
|
[DEV] Remove actionbarsherlock , replace it with Android Support Library (v7)
|
2015-05-15 11:24:14 +02:00 |
|
masensio
|
a3bc13bd5f
|
Update library reference. Changes from comments in library pull request 63
|
2015-05-15 10:53:29 +02:00 |
|
David A. Velasco
|
c0ef93882e
|
Removed extra public constructor from Fragments handled by PreviewImageActivity
|
2015-05-14 18:05:12 +02:00 |
|
Jenkins for ownCloud
|
efefb3bf2d
|
[tx-robot] updated from transifex
|
2015-05-14 01:13:58 -04:00 |
|
Jenkins for ownCloud
|
48d356d817
|
[tx-robot] updated from transifex
|
2015-05-13 01:13:51 -04:00 |
|
David A. Velasco
|
7f7af85f12
|
Better condition
|
2015-05-12 14:42:57 +02:00 |
|
David A. Velasco
|
dd35ee031b
|
Close that stream...
|
2015-05-12 14:10:53 +02:00 |
|
David A. Velasco
|
25f5eb193e
|
Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM
|
2015-05-12 13:32:56 +02:00 |
|
David A. Velasco
|
10e4373bcf
|
Minor changes after reviewing Bitmaps life cycle in PreviewImageFragment
|
2015-05-12 13:32:01 +02:00 |
|
masensio
|
e24b31f42d
|
Replace call to get.ResponseBody with get.getReponseBodyAsStream in ThumbnailsCacheManager
|
2015-05-12 13:25:36 +02:00 |
|
masensio
|
f448a36456
|
Merge branch 'develop' into thumbnailOOM
|
2015-05-11 14:58:47 +02:00 |
|
masensio
|
03bc59a2f6
|
Adapt WebDav parser for receiving exponential values in QUOTAS: Update Reference
|
2015-05-11 14:30:21 +02:00 |
|
Jenkins for ownCloud
|
d8f6448977
|
[tx-robot] updated from transifex
|
2015-05-11 01:13:48 -04:00 |
|
Jenkins for ownCloud
|
50c079d646
|
[tx-robot] updated from transifex
|
2015-05-10 01:13:53 -04:00 |
|
Jenkins for ownCloud
|
4475dcdf7b
|
[tx-robot] updated from transifex
|
2015-05-09 01:13:55 -04:00 |
|
David A. Velasco
|
47343ca299
|
Merge pull request #973 from owncloud/delete_share_option_in_app
Make share feature configurable
|
2015-05-08 14:55:07 +02:00 |
|
David A. Velasco
|
8d48929f5b
|
Fixed build
|
2015-05-08 11:27:20 +02:00 |
|
David A. Velasco
|
fb6047a72c
|
Rename the flag to show my wish that someday the app will allow to share with other users too
|
2015-05-08 11:17:39 +02:00 |
|
Jenkins for ownCloud
|
ea62e966fa
|
[tx-robot] updated from transifex
|
2015-05-08 01:13:55 -04:00 |
|
David A. Velasco
|
94f4a072ed
|
Replaced 'pass code' with 'passcode'
|
2015-05-07 12:07:44 +02:00 |
|
Jenkins for ownCloud
|
bfde0855c0
|
[tx-robot] updated from transifex
|
2015-05-07 01:13:54 -04:00 |
|
masensio
|
6f3e8fbb85
|
Merge branch 'develop' into thumbnailOOM
|
2015-05-06 13:42:43 +02:00 |
|
masensio
|
7939d3feb5
|
Merge pull request #970 from owncloud/pinEnhancement
PIN code no more: Pass code protects all the activities in the app
|
2015-05-06 09:22:38 +02:00 |
|
David A. Velasco
|
5e1f98dcaf
|
Fixes after crossed review
|
2015-05-06 09:13:10 +02:00 |
|
masensio
|
7d82231809
|
Merge branch 'develop' into pinEnhancement
|
2015-05-05 13:56:57 +02:00 |
|
masensio
|
ddbb5d2522
|
Merge branch 'develop' into thumbnailOOM
|
2015-05-05 13:53:56 +02:00 |
|
David A. Velasco
|
8882fb2dbd
|
Merge pull request #967 from owncloud/fix_upload_fails_sending_another_app
Fixed fail in upload sent from the private storage of other app
|
2015-05-05 13:51:46 +02:00 |
|
David A. Velasco
|
dcd8dde864
|
Merge branch 'develop' into pinEnhancement
|
2015-05-05 13:43:01 +02:00 |
|
David A. Velasco
|
c04d9c2198
|
Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement
|
2015-05-05 13:42:51 +02:00 |
|
masensio
|
b9c4fab1cb
|
Change message when entering an incorrect pass code
|
2015-05-05 13:37:18 +02:00 |
|
masensio
|
8debbb5f90
|
Changes from comments in PR#967, Second part
|
2015-05-05 13:18:49 +02:00 |
|
masensio
|
3c07444ff7
|
Changes from comments in PR#967
|
2015-05-05 12:56:14 +02:00 |
|
David A. Velasco
|
ef034fd6b8
|
Removed commented code
|
2015-05-05 12:49:38 +02:00 |
|
David A. Velasco
|
fdc1216471
|
Prevent that input fields are maximized in landscape
|
2015-05-05 12:27:57 +02:00 |
|