Commit graph

676 commits

Author SHA1 Message Date
David A. Velasco
be51b2c4aa Fixed regression after merge: removed 'about' entry in menu 2013-04-15 13:48:04 +02:00
David A. Velasco
7052e3b5b8 About in settings, more i18n-friendly 2013-04-15 13:45:20 +02:00
David A. Velasco
1003ecb7be Moved log path definition to FileStorageUtils 2013-04-15 13:32:49 +02:00
David A. Velasco
274dfd2958 Used Log_OC in all the logs 2013-04-15 13:17:47 +02:00
David A. Velasco
c3ca5b5a4f Merge branch 'develop' into loggingtool
Conflicts:
	AndroidManifest.xml
	res/menu/main_menu.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDetailActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
	src/eu/alefzero/webdav/FileRequestEntity.java
	src/eu/alefzero/webdav/WebdavClient.java
2013-04-15 13:12:04 +02:00
David A. Velasco
92dc4c568c Avoid null pointer in logs 2013-04-12 13:31:27 +02:00
David A. Velasco
8bba965135 Version up - 1.4.0 2013-04-12 12:47:39 +02:00
David A. Velasco
56f1df02c4 Merge branch 'feature_previews' into develop
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-12 12:46:18 +02:00
David A. Velasco
8aeb5243b7 Merge branch 'bug_hunting' into develop
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-12 12:34:17 +02:00
David A. Velasco
2a42651463 Fixed (tablet landscape): video playback is resumed in the moment it was left when the user pressed HOME 2013-04-11 16:56:51 +02:00
David A. Velasco
a11e7fd900 Fixed undesired video loop after completion, caused by bugs in GINGERBREAD 2013-04-10 13:07:10 +02:00
Thorsten
4cb97d2390 Create CodeStyleFormatter.xml 2013-04-09 17:49:37 +03:00
David A. Velasco
bed905c9b8 Fixed (tablet, landscape): when the 'playing audio' notification is clicked, the app shows the current playback details 2013-04-09 14:10:10 +02:00
David A. Velasco
8638936ce7 Merge branch 'bug_hunting' into feature_previews 2013-04-09 12:54:24 +02:00
David A. Velasco
7edc384f7e Patch to fix the lack of progress circle at the first sycnhronization of the first-created account, in Android 2.x 2013-04-09 11:17:28 +02:00
David A. Velasco
9b758dfa70 Recovery of instant uploads in temporary disabled 2013-04-04 17:15:53 +02:00
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
zerginator
5a22c7e79f Cleaned stuff , add a history delete button and renamed
Log2EmailActivity in LogHistoryActivity
2013-04-01 10:26:40 +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
58c569b968 Added CONTRIBUTING.md and THIRD_PARTY.txt 2013-03-25 15:08:40 +01:00
David A. Velasco
fa80179106 Fixed undesired restart of finished audio previews when the device orientation changes 2013-03-22 13:04:57 +01:00
David A. Velasco
83379d2674 Quick & dirty fix to avoid that 'create folder' dialog keeps the name of the last created dialog in the input field 2013-03-21 17:53:02 +01:00
David A. Velasco
67477a754b Fixed broken manifest for full screen video 2013-03-21 15:49:44 +01:00
David A. Velasco
1236edf9b0 Improvementes in full screen video: tap on video shows and hides controls; full screen available in portrait; fade out for controls reduced to 4 seconds 2013-03-21 15:49:10 +01:00
David A. Velasco
cd45a90bac Fixed typo 2013-03-21 14:00:46 +01:00
David A. Velasco
237a326598 Added German translation for media and preview text strings 2013-03-21 13:52:56 +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
bc5c3f5f06 Added full screen video when embedded video is touched 2013-03-14 16:55:57 +01:00
David A. Velasco
d92ccf8bd0 Version up: 1.3.22 2013-03-14 10:38:25 +01:00
David A. Velasco
3ac08177eb REALLY fix ArrayOutOfBoundsException when chosing icons for files with invalid MIME type 2013-03-14 10:36:22 +01:00
David A. Velasco
c837207a40 Merge pull request #90 from espenaf/master
Build owncloud apk via Maven, replacement or supplement for the setup script.
2013-03-14 01:13:09 -07:00
Thorsten
7939a4e657 Merge pull request #109 from owncloud/mergesetenvbat
setup_env.bat included and improved setup text a bit
2013-03-13 14:37:35 -07:00
zerginator
8c71e582ff setup_env.bat included and improved setup text a bit 2013-03-13 22:32:44 +01:00
David A. Velasco
2c2efa286d Saved isplaying state to avoid autoplay when a video is paused and the device orientation is changed 2013-03-13 12:21:33 +01:00
David A. Velasco
99a35347a7 Fixed horizontal layout - media controller totally visible 2013-03-13 10:59:55 +01:00
zerginator
2371b85794 Deleted unused file 2013-03-13 08:39:04 +01:00
Thorsten
8e7b972936 dfsf
dsfdsfsf
2013-03-13 00:08:50 +01:00
David A. Velasco
ce7f7fa48c Update image of play/pause button when audio playback starts 2013-03-12 14:36:31 +01:00
David A. Velasco
965870604f Version up: 1.3.21 2013-03-12 13:29:33 +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
zerginator
f256bdee52 Log_OC included 2013-03-12 08:08:04 +01:00
zerginator
8e36e7cc3e This wraps the android.util.logging into Log_OC which , if its enabled
in the app, logs the logcat into a file. It also includes the phone
information (MODEL, VERSION...)

https://github.com/owncloud/android/issues/97
2013-03-12 07:56:27 +01:00
David A. Velasco
fc134b1928 Updated translation files 2013-03-11 13:54:23 +01:00
David A. Velasco
7d67737a4f Updating translation files... 2013-03-11 13:27:56 +01:00
David A. Velasco
a99f74bd9e Disable change log; to remove in future 2013-03-11 12:45:50 +01:00
David A. Velasco
ca8a19850b Improving our own media control: removed 'next' and 'previous' buttons, removed undesired 'show' and 'hide' behaviour, fixed update of progress bar, recovered BACK button 2013-03-11 10:20:04 +01:00
zerginator
18a715072c moved About App into preferences
https://github.com/owncloud/android/issues/57
2013-03-10 20:38:46 +01:00