mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
4795 commits 227 branches 1574 tags 621 MiB
Commit graph

266 commits

Author SHA1 Message Date
Luke Owncloud
1369ef8f28 made UploadDbObject serializable 2014-11-05 15:49:03 +01:00
Luke Owncloud
64827cf4ad refactoring, commenting, understanding code. added TODO for FileUploadService. 2014-10-31 15:05:56 +01:00
David A. Velasco
2d6e7e3aaf Bump app version to 1.6.1 2014-10-24 10:51:40 +02:00
jabarros
9a5a4c127a Update version number and name 2014-09-18 10:52:37 +02:00
jabarros
a0442b48b1 Fixed bug. Copy link when sharing a file has dissapear 2014-09-04 18:04:55 +02:00
jabarros
dc984ec5bf Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders 2014-08-13 16:43:50 +02:00
jabarros
c4359ce393 Remove classes not used more after changing the view of OC accounts 2014-08-07 16:23:42 +02:00
jabarros
055be96386 Remove InstantUploadActivity and related resources 2014-07-14 08:40:16 +02:00
David A. Velasco
49c69609ea Merge branch 'develop' into release-1.5.8 2014-07-09 12:27:35 +02:00
David A. Velasco
0a99d90727 Only relative packages in AndroidManifest 2014-07-09 11:01:48 +02:00
David A. Velasco
c880929ffd Fixed last minute bugs, and clean up 2014-07-08 12:51:01 +02:00
jabarros
0ed5d39993 Update version number and name 2014-07-07 14:38:19 +02:00
David A. Velasco
40ae6d841f Updated version numbers 2014-06-02 14:51:35 +02:00
masensio
76c2cf5b84 Update version number to 1.5.6, 1.0.15(workaround) 2014-05-28 17:17:24 +02:00
masensio
3351db6527 Merge branch 'develop' into videoInstandUploads 2014-04-08 12:50:50 +02:00
masensio
407fb8f912 Update versionName and versionCode in AndroidManifest.xml (oc and workaround)) 2014-03-18 14:54:00 +01:00
David A. Velasco
ebcc9b98e3 Alternative solution for fix in 10f99ceb9ca... enforcing dialog dissmiss instead of introducing false specific onConfigurationChange 2014-03-06 16:29:21 +01:00
masensio
10f99ceb9c OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file 2014-02-26 11:05:25 +01:00
David A. Velasco
42fc189367 Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends 2014-02-19 18:00:49 +01:00
David A. Velasco
d6ac750421 Version up: 1.5.4 and JB workaround 1.0.12 2014-02-07 09:25:58 +01:00
David A. Velasco
59513cd56d Merge branch 'share_link__new_share' into share_link__new_share_menu 2014-02-03 09:46:26 +01:00
David A. Velasco
b447bf973f Added standard menu to select app used to send the link to share a file 2014-01-31 10:43:25 +01:00
David A. Velasco
871d5ea05d Moved execution of GetSharesOperation to OperationsService 2014-01-30 17:58:35 +01:00
David A. Velasco
30198bb105 App version up: 1.5.3 2014-01-21 14:41:46 +01:00
David A. Velasco
0a6c488139 Version up to 1.5.2 2013-12-05 18:06:02 +01:00
David A. Velasco
34923cf74b Merge branch 'master' into develop 2013-12-04 12:09:22 +01:00
David A. Velasco
6aac9ce9ea Version up: 1.5.1 2013-12-04 10:21:17 +01:00
David A. Velasco
732cfcede8 Removed synchronization in independent process to avoid problem in reload of certificates due to separate contexts 2013-11-29 12:14:27 +01:00
David A. Velasco
e1245bbda7 Merge branch 'develop' into refactor_remote_operation_to_create_folder 2013-11-18 14:10:16 +01:00
David A. Velasco
e78c6a7636 Version number up: 1.5.0 2013-11-13 16:16:24 +01:00
David A. Velasco
79ebc75dfa Moved some classes from root package to .utils 2013-11-13 11:17:30 +01:00
David A. Velasco
cc39a76a90 Reviewed integration with sychronization framework to fix problems in Android 4.4 2013-11-11 10:08:16 +01:00
David A. Velasco
797d164184 Merge branch 'develop' into review_build_process 2013-10-31 17:30:38 +01:00
David A. Velasco
7e30ab281d Removed unnecessary full namespaces 2013-10-29 14:39:56 +01:00
David A. Velasco
5d6ba2495a Removed unused code for ownCloud extensions and strings related 2013-10-23 11:15:44 +02:00
David A. Velasco
f79e2c0430 Merge pull request #284 from owncloud/setup_app_name 
Setup app name, optional settings, and availability of multiple accounts.
 2013-10-22 05:15:21 -07:00
masensio
6d17810140 Update serialVersionUIDs and version name/number 2013-10-18 09:01:17 +02:00
masensio
7488345470 OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00
masensio
0b42b7b01f Update version number to 1.4.5 and 1.0.6(wa_jb) 2013-09-12 18:20:21 +02:00
Luke Owncloud
01cc23802f added official NEW_PICTURE receiver (supported by Android since SDK 14). 
old (unofficial) receiver still works, as well.

this enables instant upload for all Android 4 devices (also HTC!) and has no effect on older devices.
 2013-08-05 16:34:21 +02:00
David A. Velasco
2ad777907e Version bump: 1.4.4 2013-08-01 17:58:26 +02:00
masensio
8a8a6267f6 change version to 1.4.3. Problem with version number in Google Play 2013-07-16 13:15:08 +02:00
masensio
7f57706c33 0C-601: Update version name and number, version 1.4.2 2013-07-10 18:36:45 +02:00
David A. Velasco
5b792b0440 Merge branch 'develop' into check_account_existance_in_gallery 2013-06-28 11:58:43 +02:00
David A. Velasco
f63c4ad77a Version bump: 1.4.1 2013-06-26 09:17:53 +02:00
David A. Velasco
3ecabe3ea7 PreviewVideoActivity protected against access to non-exiting account 2013-06-14 16:59:38 +02:00
David A. Velasco
fd39628997 REFACTORING: FileDetailActivity never more - simplifies transitions and removes bugs in orientation changes 2013-05-30 17:53:21 +02: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
zerginator
536cc166b6 Issue #136 [Feature] Instant upload of videos 2013-05-01 20:06:13 +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
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
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
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
8bba965135 Version up - 1.4.0 2013-04-12 12:47:39 +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
67477a754b Fixed broken manifest for full screen video 2013-03-21 15:49:44 +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
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
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
David A. Velasco
d92ccf8bd0 Version up: 1.3.22 2013-03-14 10:38:25 +01:00
David A. Velasco
965870604f Version up: 1.3.21 2013-03-12 13:29:33 +01:00
David A. Velasco
fc2af5b03e Automatic preview after download in PreviewImageActivity 2013-02-26 12:33:28 +01:00
David A. Velasco
3d272eb753 Force preview of images in 'full screen' 2013-02-25 12:24:14 +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
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
586793a261 Basic video preview in a separate actitivy 2013-02-07 11:09:28 +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
0f99bd59a1 HOTFIX (oc 1.3.20, ocw 1.0.2): fixed the creation of new accounts after installing the workaround app and rebooting 2013-01-31 16:17:32 +01:00
David A. Velasco
fdd1dbf2d7 Version up: 1.3.19 2013-01-30 16:17:23 +01:00
David A. Velasco
2b5785556e Merge branch 'master' into oauth_login 
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/files/OwnCloudFileObserver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.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
 2013-01-17 14:25:49 +01:00
David A. Velasco
c4cd9ef44c Prevent that the workaround app fixing the lost of credentials in Jelly Bean replaces the authenticator in the ownCloud 2013-01-16 12:54:15 +01:00
David A. Velasco
4aba533e6e Version 1.3.18 bump 2013-01-14 12:57:41 +01:00
David A. Velasco
11b88e0fcc Added support to OAuth2 'authorization code' grat type: get & save access token, use it to access ownCloud 2012-12-19 14:12:53 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
5be4bf17e1 Adding support to OAuth2 'authorization code' grant type [WIP] 2012-12-18 11:07:05 +01:00
David A. Velasco
1412712d89 Version bump: 1.3.17 2012-12-10 15:59:50 +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
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
264580cc33 Version bump: 1.3.15 2012-11-23 14:58:23 +01:00
David A. Velasco
cab55a8edd Login page updated to get OAuth2 access token 2012-10-31 18:59:43 +01:00
Bartek Przybylski
cce7e1247a assign octet-stream mimetype to unknown type file 2012-10-30 22:36:50 +01:00
Bartek Przybylski
b63ce78444 version bump 2012-10-30 20:12:53 +01:00
Bartek Przybylski
6c32365704 Solving modified date and length conflicts 2012-10-27 12:20:52 +02:00
Bartek Przybylski
de94751cde Two way synchronization for files 2012-10-22 21:15:26 +02:00
Bartek Przybylski
b6eb63a472 chaning photo taken name for more descriptive 2012-10-09 23:26:53 +02:00
Bartek Przybylski
fd6ce7def0 version bump to 1.3.12 2012-10-05 16:09:48 +02:00
Bartek Przybylski
c7dc135987 removing crash handler, we not have google play reports 2012-09-29 22:48:50 +02:00
David A. Velasco
b00957b5fa Added big file chunking for uplaods 2012-09-24 14:10:31 +02:00
David A. Velasco
5b60e21f43 Favourites disabled until fix can be pushed (2) 2012-09-14 14:28:14 +02:00
David A. Velasco
68667d0614 Removed crashlogger and permission request to read system logs 2012-09-13 17:51:27 +02:00
David A. Velasco
53b67429ea Added support for OC-Chunking in uploads (disabled, but ready) 2012-09-12 16:16:56 +02:00
David A. Velasco
48f13c8adc SSL connections update: notice about untrusted certificates and allow the user save them as reliable 2012-09-05 13:46:30 +02:00
David A. Velasco
be22e58b39 Uploading files are protected against removal from other apps 2012-08-24 14:50:37 +02:00
Bartek Przybylski
ba148a8278 complete two way synchronization 2012-08-22 19:33:22 +02:00