jabarros
094fa09e9e
Update version number and name in oc_jb_workaround subproject
2014-11-20 18:03:33 +01:00
jabarros
8d505deed1
Update version number and name
2014-11-20 18:01:05 +01:00
Luke Owncloud
97aa4e266b
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
...
Conflicts:
src/com/owncloud/android/files/services/FileUploadService.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2014-11-20 13:36:46 +01:00
jabarros
aa16b13ab9
Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder
2014-11-20 09:39:10 +01:00
Jenkins for ownCloud
ddfe992cbf
[tx-robot] updated from transifex
2014-11-20 01:13:29 -05:00
jabarros
1435e8c406
Merge branch 'develop' into instant_uploads_set_path
2014-11-19 18:40:06 +01:00
David A. Velasco
a98f14ecc3
Merge pull request #721 from owncloud/nea_upload_files
...
Fix upload of files from DocumentsProvider in Android > 4.4
2014-11-19 11:26:27 +01:00
David A. Velasco
d737103a77
Merge branch 'develop' into nea_upload_files
2014-11-19 11:11:15 +01:00
David A. Velasco
703366c459
Fix failed uploads when display name of file brough from external apps includes separator or path-separator characters
2014-11-19 11:05:32 +01:00
David A. Velasco
3aed2954f3
Merge pull request #736 from owncloud/fix_refresh_account_lollipop
...
Fix 'refresh account' action in Lollipop
2014-11-19 10:50:36 +01:00
jabarros
a2de2f28ab
Add new preference on settings for setting the upload video path
2014-11-19 10:14:27 +01:00
Raquel
4e72aac677
Merge branch 'develop' into fix_refresh_account_lollipop
2014-11-19 09:31:19 +01:00
jabarros
cab3c5298c
Remove 'sort' and 'logs' options from action bar menu when showing the selecting upload path folder view
2014-11-19 09:22:12 +01:00
Jenkins for ownCloud
bb8a10f735
[tx-robot] updated from transifex
2014-11-19 01:13:30 -05:00
jabarros
c2ec3f783d
When user goes to set the upload path, the folder list view is shown in the current path set
2014-11-18 15:09:39 +01:00
jabarros
87b242019c
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
2014-11-18 14:57:19 +01:00
jabarros
dc8a495e55
Remove files_move layout after creating files_folder_picker one
2014-11-18 14:53:41 +01:00
jabarros
00a8eb415a
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
2014-11-18 14:51:49 +01:00
jabarros
12b4b0397f
Add view for selecting upload path folder browsing through local file list in preferences view
2014-11-18 11:01:55 +01:00
jabarros
387374bed2
Fix errors in Frechn translations and reaname var in FileDisplayActivity
2014-11-18 10:35:52 +01:00
jabarros
3137438cd5
Merge branch 'develop' into nea_upload_files
2014-11-18 10:22:04 +01:00
Jenkins for ownCloud
d3bfbb8568
[tx-robot] updated from transifex
2014-11-18 01:13:34 -05:00
jabarros
bd6f9b384b
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support
...
Update reference to library after upgrading TLS support
2014-11-17 15:26:08 +01:00
David A. Velasco
4d04e70d12
Update reference to library after upgrading TLS support
2014-11-17 15:18:38 +01:00
jabarros
6224f73544
Fix crash in Android Lollipop when cliking on refresh the whole account
2014-11-17 14:07:48 +01:00
Luke Owncloud
4817e43c13
small changes for building on Linux
...
Conflicts:
SETUP.md
setup_env.sh
2014-11-17 13:52:56 +01:00
jabarros
05cb87c172
Update library reference
2014-11-17 13:51:04 +01:00
jabarros
a7c4814e28
Merge branch 'develop' into nea_upload_files
2014-11-17 13:49:17 +01:00
Jorge Antonio Diaz-Benito Soriano
9bfacf23cb
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
2014-11-17 13:36:26 +01:00
jabarros
297cb6b5c3
Refactoring to avoid maintenance after CR
2014-11-17 11:32:46 +01:00
Jenkins for ownCloud
3f5b3f0d1d
[tx-robot] updated from transifex
2014-11-17 01:13:35 -05:00
Luke Owncloud
537434d9ea
use file icon
2014-11-16 21:44:03 +01:00
Luke Owncloud
2ec1c65bd6
fix onclick
2014-11-16 21:40:49 +01:00
Luke Owncloud
b2d8cecfff
sort by date
2014-11-16 21:35:54 +01:00
Luke Owncloud
263164a948
fix: do upload removed files
2014-11-16 20:44:17 +01:00
Jenkins for ownCloud
1dbd577166
[tx-robot] updated from transifex
2014-11-15 01:13:35 -05:00
Luke Owncloud
2b85ed59b4
working on UploadListActivity
2014-11-14 17:02:58 +01:00
Luke Owncloud
1664d9ec68
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-11-14 13:09:01 +01:00
Oliver Gasser
e398ad0c63
Convert IDN from ASCII to Unicode in Upload Dialog
...
Display IDN host names as Unicode in the FileUpload Dialog. This dialog
is shown when multiple ownCloud accounts are setup and a file is shared
with ownCloud.
Fixes #708 .
2014-11-14 00:55:53 +01:00
David A. Velasco
1b36e1ca08
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps
...
Relative time stamps in the list of files.
2014-11-13 12:21:49 +01:00
tobiasKaminsky
7874dc4a9d
- reference bug 716
2014-11-13 10:10:57 +01:00
Jenkins for ownCloud
02a11c3b91
[tx-robot] updated from transifex
2014-11-13 01:13:37 -05:00
jabarros
5d784d98b4
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
2014-11-12 16:07:37 +01:00
tobiasKaminsky
6e34ccb817
fix Problem with < Android 3.0
2014-11-12 14:51:56 +01:00
jabarros
e4d6f267f7
Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments
2014-11-12 12:46:33 +01:00
David A. Velasco
17afcb0251
Merge pull request #683 from tobiasKaminsky/videoFullsize
...
Bugfix: video is now playing in fullscreen
2014-11-12 09:29:28 +01:00
tobiasKaminsky
79cb6106fd
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
...
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4
< 60 seconds -> "seconds ago"
2014-11-12 08:56:53 +01:00
jabarros
3cae3d3eb8
Modify kitkat document provider implementation in order to cover all 'content://' cases
2014-11-12 08:46:29 +01:00
Jenkins for ownCloud
1efefbd22c
[tx-robot] updated from transifex
2014-11-12 01:13:41 -05:00
