Commit graph

21915 commits

Author SHA1 Message Date
zerginator
e0ce2d4d5c Merge branch 'develop' into fixForCrashedSharedContents 2013-04-28 11:40:40 +02:00
zerginator
002e1bf9e3 Fix for :
Issue #131 &  Issue #132 : 
Crash when sharing contents from other apps to ownCloud
2013-04-28 11:33:20 +02:00
David A. Velasco
6496b9200d Video embedded mantains its playback state when the device is turned to other orientation 2013-04-26 14:02:17 +02:00
David A. Velasco
2b3f7c5489 Removed unused methods in WebdavClient 2013-04-25 19:44:21 +02:00
David A. Velasco
2946d8dd69 Merge branch 'develop' into oauth_login
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/authentication/AccountAuthenticator.java
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/network/OwnCloudClientUtils.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/operations/UpdateOCVersionOperation.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/eu/alefzero/webdav/WebdavClient.java
2013-04-25 19:39:22 +02:00
David A. Velasco
6a6d83311f Avoid duplicated 'refresh file' entry in context menu on an item in the list of files 2013-04-24 11:04:23 +02:00
David A. Velasco
850d7a115d Fixed: hide all the actions for single file when none of them is selected in the landscape view 2013-04-22 15:11:09 +02:00
David A. Velasco
803568ab27 Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
David A. Velasco
6ef46f264e Fixed rename of files when folder for local files is not already created 2013-04-19 10:56:00 +02:00
zerginator
74d234d48a xml wasn't readable... hopefully now 2013-04-18 00:12:25 +02:00
David A. Velasco
5b9935c849 Removed text notification about first instant upload only on line - not necessary any more 2013-04-17 18:07:00 +02:00
David A. Velasco
9ad30bdded Refactored path to directory for instant uploads; fixed some problems with first upload for never-synchronized accounts 2013-04-17 18:00:31 +02:00
David A. Velasco
bdc0332c23 Copyright note fixes 2013-04-17 12:26:13 +02:00
David A. Velasco
5bcfed8eae Select name of file in the 'rename' dialog, excluding extension
Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-15 14:29:30 +02:00
David A. Velasco
5a25a6a698 Merge pull request #118 from owncloud/loggingtool
This can go in by now.
2013-04-15 04:51:36 -07:00
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
2e5b40e357 Make the OAuth authorization available or not depending upon a variable in oauth.xml 2013-03-27 13:39:00 +01:00
David A. Velasco
7d1ea9819c Fix crash got with: 1. try to rename / delete a file with an outdated access token; 2. cancel in login activity instead of authorize again; 3. try to refresh the account 2013-03-27 12:55:47 +01:00
David A. Velasco
58c569b968 Added CONTRIBUTING.md and THIRD_PARTY.txt 2013-03-25 15:08:40 +01:00
David A. Velasco
980b31de2e Allow edition of OAuth endpoints for testing; better configuration values 2013-03-22 14:50:30 +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
David A. Velasco
18d4ff203f Fixed minor bugs inserted in clean-up 2013-03-21 13:22:53 +01:00
David A. Velasco
69d6d821ec OAuth clean-up and refactoring 2013-03-21 12:21:48 +01:00
David A. Velasco
4861636185 Refresh authorization token on failed downloads / uploads when notification error is clicked 2013-03-18 15:05:35 +01:00
David A. Velasco
5665d9c306 Merge tag 'oc-android-1-3-22' into oauth_login
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
2013-03-18 14:28:49 +01:00
David A. Velasco
7d84fd0c9f Refresh authorization token on failed synchronizations when notification error is clicked 2013-03-18 14:05:34 +01:00