mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
3880 commits 227 branches 1574 tags 621 MiB
Commit graph

1510 commits

Author SHA1 Message Date
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +02:00
masensio
35eb4dbfcf Update main_menu.xml 2015-05-27 16:53:35 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
 2015-05-27 14:19:30 +02:00
masensio
e7493203de Merge branch 'develop' into remove_ActionBarSherlock 2015-05-27 13:10:15 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
0238727d13 Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +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
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
Jenkins for ownCloud
f22c19a28d [tx-robot] updated from transifex 2015-05-25 01:13:49 -04:00
Jenkins for ownCloud
6e8fab5503 [tx-robot] updated from transifex 2015-05-24 01:13:52 -04: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
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
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
purigarcia
c775fa0691 Merge branch 'develop' into automationTest 2015-05-14 10:18: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
purigarcia
2d95a83959 Merge branch 'develop' into automationTest 2015-05-11 08:16:43 +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
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
purigarcia
6a9dfdb330 Merge branch 'develop' into automationTest 2015-05-06 19:05:03 +02:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +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
fdc1216471 Prevent that input fields are maximized in landscape 2015-05-05 12:27:57 +02:00
David A. Velasco
4f0cc76a12 Removed unneeded toggling on cursor visibility 2015-05-05 09:54:49 +02:00
David A. Velasco
510c00f66d Cleaned code in PassCodeActivity 2015-05-05 00:07:24 +02:00
masensio
a41c0b39f2 Add option to turn off share in setup.xml 2015-05-04 14:29:17 +02:00
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
purigarcia
606834980c Merge branch 'develop' into automationTest 2015-05-04 09:10:45 +02:00
Jenkins for ownCloud
3b08f9f5af [tx-robot] updated from transifex 2015-05-04 01:13:48 -04:00
Jenkins for ownCloud
be12aea5ce [tx-robot] updated from transifex 2015-05-02 01:13:50 -04:00
masensio
ce9f67ba14 Merge branch 'develop' into fix_upload_fails_sending_another_app 2015-04-30 13:23:37 +02:00
masensio
7d5c573766 Show Waiting dialog, while copy temporal file async task is working 2015-04-30 13:04:51 +02:00
Jenkins for ownCloud
f2f9fbf264 [tx-robot] updated from transifex 2015-04-30 02:30:10 -04:00
Jenkins for ownCloud
c847e97e31 [tx-robot] updated from transifex 2015-04-29 01:13:49 -04:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	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/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
Jenkins for ownCloud
3489fa1ccb [tx-robot] updated from transifex 2015-04-25 01:13:48 -04:00
Jenkins for ownCloud
25f488cfe1 [tx-robot] updated from transifex 2015-04-24 01:13:45 -04:00
Jenkins for ownCloud
3dc60cd6f7 [tx-robot] updated from transifex 2015-04-23 01:13:49 -04:00
Jenkins for ownCloud
d5ea104e99 [tx-robot] updated from transifex 2015-04-19 01:13:33 -04:00
Jenkins for ownCloud
2f196c54d6 [tx-robot] updated from transifex 2015-04-18 01:13:48 -04:00
Jenkins for ownCloud
65b2da31cc [tx-robot] updated from transifex 2015-04-17 01:13:50 -04:00
purigarcia
68b9744a9c Merge branch 'develop' into automationTest 2015-04-16 09:10:59 +02:00
Jenkins for ownCloud
15512f8d63 [tx-robot] updated from transifex 2015-04-15 01:13:36 -04:00
Jenkins for ownCloud
3fa86ebe5b [tx-robot] updated from transifex 2015-04-10 01:13:49 -04:00
masensio
558a3af1eb Merge branch 'master' into develop 2015-04-09 16:57:09 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
purigarcia
1d613754d6 Merge branch 'develop' into automationTest 2015-04-08 09:49:32 +02:00
Jenkins for ownCloud
ffa503fa76 [tx-robot] updated from transifex 2015-04-06 01:13:38 -04:00
Jenkins for ownCloud
0ba1d7e65d [tx-robot] updated from transifex 2015-04-05 01:13:38 -04:00
Jenkins for ownCloud
bf6e03b0b6 [tx-robot] updated from transifex 2015-04-04 01:13:38 -04:00
Jenkins for ownCloud
8ebf88a31b [tx-robot] updated from transifex 2015-04-03 01:13:39 -04:00
Jenkins for ownCloud
daed811588 [tx-robot] updated from transifex 2015-04-02 01:13:45 -04:00
Jenkins for ownCloud
fc644a03fd [tx-robot] updated from transifex 2015-04-01 01:13:47 -04:00
Jenkins for ownCloud
b6392f7f90 [tx-robot] updated from transifex 2015-03-31 01:13:37 -04:00
Jenkins for ownCloud
7606afa9d6 [tx-robot] updated from transifex 2015-03-29 01:13:47 -04:00
Jenkins for ownCloud
b727c1ef44 [tx-robot] updated from transifex 2015-03-28 01:13:35 -04:00
Jenkins for ownCloud
66159f83f3 [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
purigarcia
d8e954d2d3 add id and contentdescription to a layout 2015-03-25 18:54:10 +01:00
David A. Velasco
6bef4abf74 Merge pull request #924 from owncloud/add_user_agent_support 
Updated after adding custom user agent support to library
 2015-03-25 10:57:04 +01:00
David A. Velasco
30b72638a6 Merge pull request #923 from owncloud/create_folder_during_upload_pr_701_with_develop 
Create folder during upload  (PR#701) and bug fixes
 2015-03-25 09:29:13 +01:00
Jenkins for ownCloud
f1884e807d [tx-robot] updated from transifex 2015-03-25 01:13:49 -04:00
masensio
e18de547c8 Update user agent string 2015-03-24 14:53:53 +01:00
masensio
0de25b228c Update uger agent string 2015-03-24 14:44:05 +01:00
masensio
898957f9e7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-24 12:26:24 +01:00
Jenkins for ownCloud
d61c021ba4 [tx-robot] updated from transifex 2015-03-24 01:13:40 -04:00
masensio
ae440a5fa7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-23 14:29:25 +01:00
Jenkins for ownCloud
360ffadac0 [tx-robot] updated from transifex 2015-03-23 01:13:36 -04:00
Jenkins for ownCloud
556f846e9c [tx-robot] updated from transifex 2015-03-22 01:13:35 -04:00
Jenkins for ownCloud
2b0e8eddda [tx-robot] updated from transifex 2015-03-21 01:13:36 -04:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
Jenkins for ownCloud
205bd47325 [tx-robot] updated from transifex 2015-03-20 01:13:42 -04:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
Jenkins for ownCloud
1a39af3e95 [tx-robot] updated from transifex 2015-03-19 01:13:50 -04:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
879160bebe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-18 09:20:02 +01:00
Jenkins for ownCloud
4fedf76cb0 [tx-robot] updated from transifex 2015-03-18 01:13:35 -04:00
Jenkins for ownCloud
b7796c99f6 [tx-robot] updated from transifex 2015-03-17 01:13:40 -04:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
Jenkins for ownCloud
3c55631bee [tx-robot] updated from transifex 2015-03-15 01:13:34 -04:00
Jenkins for ownCloud
8b900a6410 [tx-robot] updated from transifex 2015-03-14 01:13:43 -04:00
Jenkins for ownCloud
67ecc0f262 [tx-robot] updated from transifex 2015-03-13 01:13:37 -04:00
Jenkins for ownCloud
311f0bd332 [tx-robot] updated from transifex 2015-03-12 01:13:34 -04:00
Jenkins for ownCloud
3826462073 [tx-robot] updated from transifex 2015-03-11 01:13:43 -04:00
masensio
c963eb0fad Merge branch 'develop' into accessibility 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2015-03-10 14:58:21 +01:00
masensio
01483a38bf Merge remote-tracking branch 'origin/develop' into share_password_support 2015-03-10 14:27:35 +01:00
Jenkins for ownCloud
5f3175229a [tx-robot] updated from transifex 2015-03-10 01:13:47 -04:00
masensio
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
purigarcia
151c70c443 Merge branch 'develop' into share_password_support 2015-03-09 09:21:38 +01:00
Jenkins for ownCloud
eac3e1ddf1 [tx-robot] updated from transifex 2015-03-09 01:13:33 -04:00
Jenkins for ownCloud
c404060351 [tx-robot] updated from transifex 2015-03-08 01:13:33 -05:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
David A. Velasco
eafaf80dd4 Merge pull request #912 from owncloud/review_license 
Reviewed license text in source files.
 2015-03-06 09:45:56 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
690341af68 Create layout for password 2015-03-05 17:02:40 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
Jenkins for ownCloud
664ee08a3c [tx-robot] updated from transifex 2015-03-05 01:13:45 -05:00
Jenkins for ownCloud
a349906e77 [tx-robot] updated from transifex 2015-03-04 01:13:41 -05:00
Jenkins for ownCloud
3cab8a4986 [tx-robot] updated from transifex 2015-03-03 01:13:33 -05:00
Jenkins for ownCloud
3d66b4ccc0 [tx-robot] updated from transifex 2015-03-01 01:13:35 -05:00
Jenkins for ownCloud
0f3af9c0ef [tx-robot] updated from transifex 2015-02-28 01:13:44 -05:00
Jenkins for ownCloud
c1efe4304b [tx-robot] updated from transifex 2015-02-27 01:13:37 -05:00
Jenkins for ownCloud
62bbe70290 [tx-robot] updated from transifex 2015-02-26 01:13:46 -05:00
Jenkins for ownCloud
72bd1c17a5 [tx-robot] updated from transifex 2015-02-25 01:13:42 -05:00
masensio
759b5e3e72 Merge pull request #888 from owncloud/enable_cookies 
Enable cookies
 2015-02-24 14:05:54 +01:00
Jenkins for ownCloud
4c964b7dcb [tx-robot] updated from transifex 2015-02-24 01:13:38 -05:00
Jenkins for ownCloud
6a88d7a9f4 [tx-robot] updated from transifex 2015-02-22 01:13:32 -05:00
Jenkins for ownCloud
099b32fc42 [tx-robot] updated from transifex 2015-02-21 01:13:31 -05:00
Jenkins for ownCloud
fd8e590ea0 [tx-robot] updated from transifex 2015-02-20 01:13:38 -05:00
masensio
0a03b6d3d4 Merge branch 'develop' into enable_cookies 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2015-02-19 13:02:53 +01:00
David A. Velasco
ec6b9d7c70 Merge branch 'master' into develop 2015-02-19 11:01:00 +01:00
Jenkins for ownCloud
ae1bd1b6a1 [tx-robot] updated from transifex 2015-02-18 01:13:36 -05:00
David A. Velasco
2cfed6eaa7 Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts 2015-02-17 14:00:18 +01:00
Jenkins for ownCloud
7fa529d328 [tx-robot] updated from transifex 2015-02-17 01:13:43 -05:00
Jenkins for ownCloud
effee70675 [tx-robot] updated from transifex 2015-02-15 01:13:29 -05:00
Jenkins for ownCloud
5e1048b343 [tx-robot] updated from transifex 2015-02-14 01:13:32 -05:00
Jenkins for ownCloud
754c277fdd [tx-robot] updated from transifex 2015-02-13 01:13:30 -05:00
Jenkins for ownCloud
f149a9cf77 [tx-robot] updated from transifex 2015-02-12 01:13:31 -05:00
Jenkins for ownCloud
c4110d4be7 [tx-robot] updated from transifex 2015-02-11 01:13:30 -05:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
Jenkins for ownCloud
6162271dff [tx-robot] updated from transifex 2015-02-10 01:13:32 -05:00
Jenkins for ownCloud
62c54ac2ad [tx-robot] updated from transifex 2015-02-09 01:13:30 -05:00
Jenkins for ownCloud
7d8cbde64f [tx-robot] updated from transifex 2015-02-08 01:13:31 -05:00
Jenkins for ownCloud
fa0b91d7fb [tx-robot] updated from transifex 2015-02-07 01:13:34 -05:00
Jenkins for ownCloud
b047882001 [tx-robot] updated from transifex 2015-02-06 01:13:31 -05:00
Jenkins for ownCloud
f8c91b0458 [tx-robot] updated from transifex 2015-02-05 01:13:34 -05:00
Jenkins for ownCloud
8bc75d54b4 [tx-robot] updated from transifex 2015-02-04 01:14:14 -05:00
David A. Velasco
936d8466c6 Updated with fixes in Spanish translation 2015-02-03 14:01:59 +01:00
David A. Velasco
1726a9352a Updated translations after new format string for subject in sharing e-mail 2015-02-03 13:37:22 +01:00
David A. Velasco
28e4b35595 Quotes updated in subject message for shared link, better format string 2015-02-03 13:17:14 +01:00
David A. Velasco
e4e50d44c4 Corrections from my own comments 2015-02-03 09:52:22 +01:00
David A. Velasco
4af15f7b4e Merge branch 'develop' into imageGrid 2015-02-02 13:48:30 +01:00
Jenkins for ownCloud
8bf624ff8f [tx-robot] updated from transifex 2015-02-01 01:13:30 -05:00
Jenkins for ownCloud
2210ce961a [tx-robot] updated from transifex 2015-01-31 01:13:34 -05:00
masensio
42b5a1e28f Update some icons 2015-01-30 14:37:16 +01:00
masensio
7f6c5bd3b2 Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop 2015-01-30 12:10:15 +01:00
masensio
700318fec0 Update some icons 2015-01-30 11:00:14 +01:00
Jenkins for ownCloud
9d491f71ed [tx-robot] updated from transifex 2015-01-30 01:13:31 -05:00
Jenkins for ownCloud
16b36d0418 [tx-robot] updated from transifex 2015-01-29 01:13:38 -05:00
masensio
d3b0747dde Merge pull request #866 from owncloud/download_folder 
Download a folder
 2015-01-28 09:31:25 +01:00
masensio
0b8f3db914 Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon 2015-01-28 08:59:57 +01:00
Jenkins for ownCloud
da67575522 [tx-robot] updated from transifex 2015-01-28 01:13:45 -05:00
masensio
8ebaba45e7 Show status icons in gridview 2015-01-27 13:51:44 +01:00
masensio
051265620c Add share icons and localFileIndicator to grid_image and grid_item layout 2015-01-27 09:46:19 +01:00
Jenkins for ownCloud
97386bdb87 [tx-robot] updated from transifex 2015-01-26 01:13:30 -05:00
jabarros
7d21a9ec5d Merge pull request #825 from owncloud/SettingsGreyedOut 
Instant Upload settings hide/show
 2015-01-23 09:29:11 +01:00
jabarros
0470de47e0 Fixed. Line behind the folder is not shown in the upload view 2015-01-22 09:29:36 +01:00
jabarros
38ea01dc1e Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/ 2015-01-21 17:51:16 +01:00
jabarros
9b1b5f5e3b Fixed. Footer message should be showed in the list view mode. Also added in grid view mode. 2015-01-21 11:08:15 +01:00
Jenkins for ownCloud
9fcb1612fe [tx-robot] updated from transifex 2015-01-21 01:13:32 -05:00
jabarros
f01156527a Fix. Uploads view is not shown correctly 2015-01-20 14:38:32 +01:00
jabarros
d751df3daa Add Scrollview in list fragment layout for showing text message 2015-01-20 10:43:39 +01:00
jabarros
451783be22 Merge branch 'develop' into imageGrid 2015-01-20 09:56:45 +01:00
jabarros
d0cee8be85 Merge branch 'develop' into SettingsGreyedOut 2015-01-20 09:25:20 +01:00
Jenkins for ownCloud
99276bae85 [tx-robot] updated from transifex 2015-01-20 01:13:34 -05:00
tobiasKaminsky
3c79991b12 Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2 
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	owncloud-android-library
 2015-01-19 22:24:33 +01:00
tobiasKaminsky
b5fdba576f changes as requested 2015-01-19 22:13:45 +01:00
tobiasKaminsky
d4e0f3bdb1 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-19 21:02:37 +01:00
jabarros
e98fc8b141 Merge branch 'develop' into download_folder 2015-01-19 12:49:28 +01:00
Jenkins for ownCloud
880ffab34c [tx-robot] updated from transifex 2015-01-19 01:13:30 -05:00
tobiasKaminsky
6d5c6f86e5 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-18 17:00:29 +01:00
Jenkins for ownCloud
bdb959f2e2 [tx-robot] updated from transifex 2015-01-18 01:13:30 -05:00
Jenkins for ownCloud
46427dad18 [tx-robot] updated from transifex 2015-01-17 01:13:31 -05:00
Jenkins for ownCloud
86f9d43e8a [tx-robot] updated from transifex 2015-01-15 01:13:33 -05:00
Jenkins for ownCloud
369fb6a0be [tx-robot] updated from transifex 2015-01-14 01:13:29 -05:00
Jenkins for ownCloud
f206d8c674 [tx-robot] updated from transifex 2015-01-13 01:13:31 -05:00
jabarros
e9016281bd Add contentDescription tag into main menu items 2015-01-12 13:25:07 +01:00
David A. Velasco
b894a0a4f9 Removed ... from content description 2015-01-12 09:44:00 +01:00
Jenkins for ownCloud
26403abd0a [tx-robot] updated from transifex 2015-01-12 01:13:29 -05:00
Jenkins for ownCloud
acd19c911b [tx-robot] updated from transifex 2015-01-10 01:13:30 -05:00
tobiasKaminsky
d54345d040 Merge remote-tracking branch 'upstream/develop' into uploadNewFolder 
Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-01-08 22:41:41 +01:00
jabarros
3929f1e740 Add content description tag into EditText in account_setup 2015-01-08 13:07:54 +01:00
jabarros
d05d5ffe1a Merge branch 'develop' into download_folder 2015-01-07 14:04:46 +01:00
jabarros
f737785b4f Change error message when trying download a folder that does not exist 2015-01-07 13:47:38 +01:00
jabarros
90e49a96e4 Added folder name to 'file not found' error message 2015-01-07 13:04:46 +01:00
jabarros
1db11eb586 Fix. App does not realize that the folder does not exist 2015-01-07 11:22:24 +01:00
Jenkins for ownCloud
f670cfad8f [tx-robot] updated from transifex 2015-01-07 01:13:30 -05:00
Jenkins for ownCloud
464db6b4c5 [tx-robot] updated from transifex 2015-01-06 01:13:30 -05:00
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
Jenkins for ownCloud
ea101df8f5 [tx-robot] updated from transifex 2015-01-05 01:13:29 -05:00
Jenkins for ownCloud
c8dc970121 [tx-robot] updated from transifex 2015-01-04 01:13:31 -05:00
Jenkins for ownCloud
57a840c92e [tx-robot] updated from transifex 2015-01-03 01:13:28 -05:00
Jenkins for ownCloud
c03ea61704 [tx-robot] updated from transifex 2015-01-02 01:13:30 -05:00
tobiasKaminsky
cb725acdf3 - removed whitespaces 
- renamed pin description
 2015-01-01 13:06:25 +01:00
Jenkins for ownCloud
2fb89a9238 [tx-robot] updated from transifex 2015-01-01 01:13:33 -05:00
Jenkins for ownCloud
410bb307e1 [tx-robot] updated from transifex 2014-12-31 01:13:30 -05:00
tobiasKaminsky
74bd1d8d78 - clarify pin description 2014-12-30 09:35:48 +01:00
Jenkins for ownCloud
04631b6313 [tx-robot] updated from transifex 2014-12-30 01:13:30 -05:00
tobiasKaminsky
0e061f6f06 - fix #47 2014-12-29 22:36:15 +01:00
Jenkins for ownCloud
56459b1da2 [tx-robot] updated from transifex 2014-12-29 01:13:29 -05:00
Jenkins for ownCloud
4f2a917933 [tx-robot] updated from transifex 2014-12-28 01:13:30 -05:00
jabarros
f0905fbaac Merge pull request #784 from ekeitho/develop 
subject mail populated when user shares >>file/folder<<
 2014-12-26 09:04:02 +01:00
Jenkins for ownCloud
b64e5ff65b [tx-robot] updated from transifex 2014-12-26 01:13:28 -05:00
Jenkins for ownCloud
db3c9440fb [tx-robot] updated from transifex 2014-12-25 01:13:29 -05:00
Jenkins for ownCloud
64c3c9d53c [tx-robot] updated from transifex 2014-12-24 01:13:31 -05:00
Keith Abdulla
150050aeb0 fix tab indent 2014-12-23 09:38:38 -08:00
Keith Abdulla
1db0d7daf2 create an extra string resource 2014-12-23 09:31:59 -08:00
Jenkins for ownCloud
a11f951ed7 [tx-robot] updated from transifex 2014-12-23 01:13:30 -05:00
Jenkins for ownCloud
29eba16031 [tx-robot] updated from transifex 2014-12-22 01:13:44 -05:00
Jenkins for ownCloud
68e8a942a1 [tx-robot] updated from transifex 2014-12-21 01:13:29 -05:00
Jenkins for ownCloud
167c86b4ac [tx-robot] updated from transifex 2014-12-20 01:13:31 -05:00
Jenkins for ownCloud
78c1a484e7 [tx-robot] updated from transifex 2014-12-19 01:13:38 -05:00
jabarros
6f11fa1c09 Added content description tag in 'account setup' layout elements 2014-12-18 12:22:07 +01:00
Jenkins for ownCloud
f8acc67eb7 [tx-robot] updated from transifex 2014-12-18 01:13:30 -05:00
Jenkins for ownCloud
b23d33b737 [tx-robot] updated from transifex 2014-12-17 01:13:32 -05:00
Jenkins for ownCloud
2c48adc760 [tx-robot] updated from transifex 2014-12-16 01:13:32 -05:00
Jenkins for ownCloud
3772a9d78e [tx-robot] updated from transifex 2014-12-15 01:13:29 -05:00
Jenkins for ownCloud
c6ce747d8a [tx-robot] updated from transifex 2014-12-14 01:13:29 -05:00
Jenkins for ownCloud
885e76abb1 [tx-robot] updated from transifex 2014-12-13 01:13:30 -05:00
Jenkins for ownCloud
9cdcea64ee [tx-robot] updated from transifex 2014-12-12 01:13:36 -05:00
David A. Velasco
1f796350b0 Merge pull request #781 from owncloud/fix_logs_change_orientation 
User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)
 2014-12-11 10:21:41 +01:00
jabarros
c34646aed3 Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation 2014-12-10 14:13:32 +01:00
jabarros
0df8f178de Merge pull request #754 from owncloud/RadioListOnAccounts 
Account list is now a radiobutton list
 2014-12-10 08:45:12 +01:00
Keith Abdulla
3d8174a73e fix tab 2014-12-09 23:01:48 -08:00
Jenkins for ownCloud
d0ec8b4ea3 [tx-robot] updated from transifex 2014-12-10 01:13:40 -05:00
Keith Abdulla
1704c4f788 move subject message strings into strings.xml 2014-12-09 17:51:10 -08:00
Jenkins for ownCloud
cd883c67f7 [tx-robot] updated from transifex 2014-12-08 01:13:29 -05:00
Jenkins for ownCloud
dac3ced86d [tx-robot] updated from transifex 2014-12-07 01:13:35 -05:00
Jenkins for ownCloud
940f0cc89c [tx-robot] updated from transifex 2014-12-06 01:13:30 -05:00
Jenkins for ownCloud
c7c53c93ba [tx-robot] updated from transifex 2014-12-05 01:13:30 -05:00
Jenkins for ownCloud
da691e0bfd [tx-robot] updated from transifex 2014-12-04 01:13:37 -05:00
Jorge Antonio Diaz-Benito Soriano
49e8dafac0 Merge remote-tracking branch 'upstream/develop' into us4_view_text_files 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2014-12-03 15:08:45 +01:00
David A. Velasco
50e39f044f Merge branch 'master' into develop 2014-12-03 11:31:49 +01:00
jabarros
0a0c808e3b Merge pull request #662 from tobiasKaminsky/fileCount 
File count
 2014-12-02 08:31:54 +01:00
Jorge Antonio Diaz-Benito Soriano
d5566ce0a3 Merge remote-tracking branch 'upstream/develop' into us4_view_text_files 2014-11-29 21:12:51 +01:00
Jenkins for ownCloud
37713d798b [tx-robot] updated from transifex 2014-11-28 01:13:32 -05:00
David A. Velasco
44c0d86ede Merge pull request #752 from owncloud/instant_uploads_set_path 
Better UI for settings path of instant uploads
 2014-11-26 13:10:04 +01:00
jabarros
5c0e9ca5f2 Changes after CR 2014-11-26 09:05:23 +01:00
tobiasKaminsky
611905a5d0 - Account list is now a radiobutton list 2014-11-25 17:42:41 +01:00
Jorge Antonio Diaz-Benito Soriano
10a12fb960 Merge branch 'gradleWithInternalDependency' into us4_view_text_files 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2014-11-24 12:57:02 +01:00