Commit graph

3978 commits

Author SHA1 Message Date
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
David A. Velasco
d58e131dc5 Enforce to add empty folders lost by git 2015-05-26 14:00:41 +02:00
David A. Velasco
3ead0b6f6e Try to enforce newer Android build tools in Travis 2015-05-26 13:54:07 +02:00
David A. Velasco
e354f8861e Fixed setup_env.sh 2015-05-26 13:45:35 +02:00
masensio
ddf649453c Update library reference: fix NullPointerException in quota value 2015-05-26 13:44:28 +02:00
David A. Velasco
519bebf461 Added exploded appcompat-v7 AAR to allow building from Ant and Eclipse 2015-05-26 13:31:50 +02:00
masensio
0238727d13 Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
masensio
e934f015e8 Enable 'Logs' navigation drawer entry only in DEBUG mode 2015-05-26 12:55:40 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
masensio
6d8fc58eab Remove some imports 2015-05-26 08:48:36 +02:00
Jenkins for ownCloud
973aa26b5d [tx-robot] updated from transifex 2015-05-26 01:13:51 -04:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
purigarcia
d9a541d32a test: favorite + refresh 2015-05-25 09:15:03 +02:00
Jenkins for ownCloud
f22c19a28d [tx-robot] updated from transifex 2015-05-25 01:13:49 -04:00
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
purigarcia
8386357e68 add headers. reformat files 2015-05-15 12:32:16 +02: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
purigarcia
c775fa0691 Merge branch 'develop' into automationTest 2015-05-14 10:18:12 +02:00
purigarcia
b4b160d219 change the name of a variable 2015-05-14 10:15:34 +02:00
purigarcia
3567b86e77 fix upload test cases 2015-05-14 10:13:14 +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
purigarcia
7f24cb41fb some changes needed to uploads from gmail 2015-05-12 13:36:38 +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
purigarcia
2f1e634342 rename the package, changes some files names, more config variables 2015-05-11 11:45:49 +02:00