Commit graph

936 commits

Author SHA1 Message Date
David A. Velasco
50d77e8dc8 Review of login view layout optimizing the adaption to different screen sizes 2013-05-10 16:35:01 +02:00
David A. Velasco
429024cc57 Merge pull request #158 from owncloud/direct_jump_to_setup_view_when_no_account
Direct jump to setup view when no account
2013-05-07 05:38:21 -07:00
David A. Velasco
fe159af4ea Removed unnecessary code for showing progress circle after creation of first account 2013-05-07 14:25:48 +02:00
David A. Velasco
bc1fcf8493 Added account existance validation to FileDetailsActivity 2013-05-07 13:49:54 +02:00
David A. Velasco
979bdc83b2 Replaced public scope with protected scope in inherited on*** methods for FileActivityS 2013-05-07 13:05:40 +02:00
David A. Velasco
f6780fdc00 Improved implementation of redirection for first account 2013-05-07 12:54:31 +02:00
David A. Velasco
d22fc90d67 Merge pull request #155 from owncloud/file_browsing_refactoring
File browsing refactoring
2013-05-06 01:51:27 -07:00
David A. Velasco
b36914df88 Merge branch 'develop' into file_browsing_refactoring
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2013-05-06 10:48:43 +02:00
David A. Velasco
fc4819a504 Merge pull request #139 from owncloud/fixForCrashedSharedContents
Fix for crashed shared contents - Good job here,@zerginator.
2013-05-03 05:26:21 -07:00
David A. Velasco
65f403bf99 Merge branch 'develop' into fixForCrashedSharedContents
Conflicts:
	src/com/owncloud/android/Uploader.java
2013-05-03 14:25:02 +02:00
David A. Velasco
52bd01bced Merge pull request #152 from owncloud/oauth_login
Oauth login and authenticator refactoring
2013-05-03 04:38:21 -07:00
David A. Velasco
1ee5b70d94 Generic values for Oauth 2 configuration 2013-05-03 13:30:35 +02:00
David A. Velasco
2a95f59adc Fixed bug when turning tablet with no file in the right fragment
Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-05-03 13:14:32 +02:00
David A. Velasco
a95456884c Fixed bugs after merge 2013-05-03 10:34:25 +02:00
David A. Velasco
9b4da8439a Merge branch 'develop' into oauth_login
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
2013-05-03 10:24:20 +02:00
David A. Velasco
bfbb733b67 Merge pull request #151 from owncloud/scrollOnSetupScreen
Scroll on setup screen
2013-05-02 09:03:17 -07:00
David A. Velasco
f6846b6686 Fixed flow from click on (up|down)load notifications in landscape tablets: dual pane, please 2013-05-02 16:34:38 +02:00
zerginator
b4eed72943 deleted cancel button 2013-05-01 21:37:52 +02:00
zerginator
2acbe9455d Issue #56 + Issue #14 + Issue #143 2013-05-01 21:34:13 +02:00
David A. Velasco
00328cb889 Video previews reworked to provide seamless playback in turns and changes between fullscreen and embedded, in any combination and order 2013-04-30 13:16:08 +02:00
zerginator
5b9bf1ad3f Issue #28 folders don't show date and size info 2013-04-28 15:19:34 +02:00
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