David A. Velasco
053aad5ae1
Merge branch 'bug_hunting' into feature_previews
...
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:49:04 +02:00
David A. Velasco
77ddd1ccb6
Merge branch 'develop' into feature_previews
...
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:44:30 +02:00
David A. Velasco
97ae9007e4
Fixed hardcoded string in UploaderActivity layout; and German translations
2013-03-27 17:19:19 +01:00
David A. Velasco
cd45a90bac
Fixed typo
2013-03-21 14:00:46 +01:00
Matthias Baumann
6c5f561342
- exclude none InstantUpload from InstantUploadActivity
...
- add simple Activity for none InstantUloads to show the whole
error-message
2013-03-17 10:38:42 +01:00
Matthias Baumann
7392cfe5ab
- InstantUpload path const not longer at two places, only at
...
InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially for QUOTA_EXCEEDED is it necessary to show that to
the user
2013-03-16 18:56:27 +01:00
David A. Velasco
dc08386401
Merge branch 'details' into feature_previews
2013-03-12 13:03:15 +01:00
David A. Velasco
1493579a2e
Changed 'See details' option menu for 'Details'
2013-03-12 13:02:51 +01:00
David A. Velasco
7d67737a4f
Updating translation files...
2013-03-11 13:27:56 +01:00
David A. Velasco
d68b324653
Create our own media control - basic operation
2013-03-08 13:32:10 +01:00
David A. Velasco
6cfa24f55a
Improved error messages in gallery for images that can not be loaded
2013-03-01 09:54:49 +01:00
David A. Velasco
cb66b59918
Minimize new fragment to monitor the progress of file download
2013-02-25 15:19:18 +01:00
Matthias Baumann
f764980474
- extend existing FileUpload, so we can handel failed instand upload
...
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
-touch to the 'Faild Upload Notifivation'
-submenue underneath the upload menue
- merges from head
- add lazy loading for the images list with failed uploads
2013-02-25 08:21:33 +01:00
David A. Velasco
24dd513682
Added progress bar for file transfers in details view (untested)
2013-02-19 13:28:01 +01:00
David A. Velasco
f2474ae28d
Added basic menu options to the preview fragment: open, delete, see details
2013-02-18 11:23:18 +01:00
David A. Velasco
7101a04247
Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded
2013-02-14 19:21:09 +01:00
David A. Velasco
9420651936
Error messages for media playback improved
2013-02-12 12:07:42 +01:00
David A. Velasco
11c1ad8f78
Fixed bad behaviours when an error occurrs during audio playback
2013-02-12 11:26:38 +01:00
David A. Velasco
e4cd3fe54c
Removed unused code in MediaService
2013-02-11 12:46:50 +01:00
David A. Velasco
6103446ab8
Error messages for video playback reviewed
2013-02-11 11:33:50 +01:00
David A. Velasco
4dc81e5168
Removed usused drawable; list_selector rewritten from scratch with new license (and color fixed for Android before ICS)
2013-02-08 11:37:02 +01:00
David A. Velasco
2623e9c195
Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished
2013-02-08 09:22:46 +01:00
David A. Velasco
bb257ec729
Updated copyright in source files
2013-02-07 18:45:10 +01:00
David A. Velasco
7018ae7e1f
Added music player service in background; 'open' button in details used to test (temporal)
2013-02-05 12:20:47 +01:00
David A. Velasco
5da9c095a4
Added dialog in the main app to advise users about the workaround app
2013-01-30 13:46:15 +01:00
David A. Velasco
7239b9eb9d
Translations update
2013-01-10 18:38:41 +01:00
David A. Velasco
279670c303
Merge remote-tracking branch 'origin/sync_review_2'
2012-12-05 23:23:10 +01:00
David A. Velasco
4558866223
Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder
2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7
Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed
2012-12-04 12:49:18 +01:00
David A. Velasco
a7535406d4
Customized error message for uploads when the local file cannot by copied to the ownCloud local directory
2012-11-30 14:39:31 +01:00
David A. Velasco
3ef64834e9
Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization.
2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb
Files uploaded in the past are copied to the local ownCloud directory during account synchronization
2012-11-30 11:29:18 +01:00
David A. Velasco
236895e7f8
Refactored app name in strings.xml
2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5
Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup
2012-11-29 11:28:34 +01:00
David A. Velasco
4c50eb4d2d
Merge of master after sync_review was merged into it
2012-11-23 10:25:06 +01:00
David A. Velasco
d49bfd0c77
Added title to rename dialog; and some cleaning
2012-11-22 10:24:26 +01:00
David A. Velasco
38a80be828
Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used
2012-11-20 14:41:04 +01:00
David A. Velasco
c301865c35
Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts
2012-11-16 16:23:45 +01:00
David A. Velasco
a7ee15e023
Renaming confussing token
2012-11-16 09:42:51 +01:00
David A. Velasco
ff2271a8c5
Download button in file details view upgraded to sync file content in both directions
2012-11-15 17:18:04 +01:00
David A. Velasco
500cbf9cea
New items in the context menu for files (not folders), depending upon its state
2012-11-06 15:13:27 +01:00
David A. Velasco
b27ebf0310
Removal of folders completed
2012-11-05 15:44:09 +01:00
David A. Velasco
454f15138e
Rename and remove operations connected to the contextual menu over items at the list of files
2012-10-31 17:41:57 +01:00
David A. Velasco
3d72058691
Quick fix to avoid two lines in button
2012-10-30 11:24:30 +01:00
David A. Velasco
cc1eb7a352
SSL warning with more information about certificate, accessible through a new 'Details' button
2012-10-29 15:03:34 +01:00
Bartek Przybylski
6c32365704
Solving modified date and length conflicts
2012-10-27 12:20:52 +02:00
David A. Velasco
8f2314d80e
Improved explanation in PIN code view
2012-10-19 09:24:34 +02:00
David A. Velasco
97f21ee7be
About message moved to strings.xml
2012-10-17 19:34:31 +02:00
David A. Velasco
d0f7de3ce0
Added help text in background of empty files list
2012-10-17 19:22:40 +02:00
David A. Velasco
d193e0031b
Added explanation in the view for PIN Code creation
2012-10-17 11:04:27 +02:00
