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
|
ccfd7772df
|
Removed some unused classes
|
2013-02-08 09:05:37 +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
|
18bf35a809
|
Added MediaController user interface to handle audio files in the MediaService
|
2013-02-06 14:14:55 +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
|
37f0586c47
|
Merge branch 'file_icons' into workaround_integration
|
2013-01-30 13:49:36 +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
|
f1f8c749d1
|
Save new token / credentials to make them permanent
|
2013-01-29 11:49:42 +01:00 |
|
David A. Velasco
|
fb8a8a2166
|
Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials
|
2013-01-28 13:15:28 +01:00 |
|
David A. Velasco
|
63106c9238
|
Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth
|
2013-01-25 15:11:10 +01:00 |
|
David A. Velasco
|
1e5aa5345f
|
Fixed visibility of authorization details when the device is turned aside; removed unused classes from old OAuth flow
|
2013-01-24 18:31:40 +01:00 |
|
David A. Velasco
|
d6f725bfeb
|
Fixed icon for text files
|
2013-01-24 14:03:38 +01:00 |
|
David A. Velasco
|
f440d30e42
|
Code ready to provide different icons for well-known MIME types
|
2013-01-24 13:34:27 +01:00 |
|
David A. Velasco
|
ac07e35d8a
|
Merge remote-tracking branch 'origin/oauth_login' into oauth_login
|
2013-01-24 10:30:18 +01:00 |
|
David A. Velasco
|
088b1e83a4
|
Cleaning-up AuthenticatorActivty code
|
2013-01-24 10:29:11 +01:00 |
|
David A. Velasco
|
aa19d76441
|
Cleaning-up AuthenticatorActivty code
|
2013-01-24 10:27:53 +01:00 |
|
David A. Velasco
|
e9f13d77ce
|
Redirect app to login screen when any operation started from a foreground component fails due to bad credentials
|
2013-01-17 16:03:59 +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
|
73f8797b75
|
Redirect app to login screen when operations in file details view fail due to bad credentials
|
2013-01-17 13:01:51 +01:00 |
|
David A. Velasco
|
f91d3ce792
|
Fixed null pointer in FileObserverService initialization
|
2013-01-14 12:38:46 +01:00 |
|
David A. Velasco
|
7f881d1712
|
Merge branch 'master' into crash_fixes
|
2013-01-11 18:44:47 +01:00 |
|
David A. Velasco
|
05d053beae
|
Merge pull request #66 from jmiazga/master
Issue 46 fix
|
2013-01-11 05:37:42 -08:00 |
|
David A. Velasco
|
7239b9eb9d
|
Translations update
|
2013-01-10 18:38:41 +01:00 |
|
David A. Velasco
|
840c842f03
|
Fixed bug: empty folders are kept in device database when sucessfully removed
|
2013-01-10 16:27:05 +01:00 |
|
David A. Velasco
|
4905f9a396
|
Fixed bug preventing the enter in empty folders when uploading files from external apps through 'share to' or 'send'
|
2013-01-10 16:12:59 +01:00 |
|
David A. Velasco
|
471bff2aec
|
Fixed crash when uploading a file in any account after cleaning app data
|
2013-01-10 11:39:22 +01:00 |
|
David A. Velasco
|
afa58b8ac6
|
Fixed bad update of details view for an uploading file when it finishes, resulting in a renamed file due to other file in the server with the same name ; and subsequent crash got by pressing 'Cancel'
|
2013-01-09 16:55:25 +01:00 |
|
David A. Velasco
|
35b25f04eb
|
Fixed crash in test of files downloading / uploading
|
2013-01-09 10:11:21 +01:00 |
|
David A. Velasco
|
a1a31b68d9
|
Fixed crash when an upload is confirmed with no file selected
|
2013-01-08 17:48:58 +01:00 |
|
David A. Velasco
|
6faa03a084
|
Remove unused Object member causing problems with serialization; back to previous serializationUID
|
2013-01-08 17:31:04 +01:00 |
|
jmiazga
|
124b43cb4e
|
text selection is kept when user toggles between visible and non visible password
|
2013-01-04 09:40:13 -05:00 |
|
David A. Velasco
|
66442da081
|
Fixed double upload of files with OAuth + Bearer authorization
|
2012-12-19 18:42:38 +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
|
e83a73cb9d
|
Avoid the necessity to synchronize the account after the upgrade to 1.3.16
|
2012-12-10 14:01:45 +01:00 |
|
David A. Velasco
|
2b5bb1fb90
|
Minimize the number of unnecessary file trasnfers after the upgrade to 1.3.16 for files already in the device
|
2012-12-06 15:28:12 +01:00 |
|
David A. Velasco
|
f74e7ab11a
|
Merge remote-tracking branch 'origin/sync_review_2'
|
2012-12-06 14:03:50 +01:00 |
|
David A. Velasco
|
a08c92cf9a
|
Fixed bug in synchronization after adding new field to improve the check of changes in server
|
2012-12-06 14:02:09 +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
|
abd5f51554
|
Fixed check of modifications applied in server (still based on modification date)
|
2012-12-05 16:14:01 +01:00 |
|
David A. Velasco
|
4476c04736
|
Fixed copy and movement of files to ownCloud local folder with explicit creation of parent directory and target file
|
2012-12-05 16:01:19 +01:00 |
|
David A. Velasco
|
082c11a1e3
|
Fixed movement of files: parent folder must be created before move; besides, extra checks to avoid NULL pointers in dialogs
|
2012-12-05 12:37:37 +01:00 |
|
David A. Velasco
|
80448dc192
|
Fixed NULL pointers and wrong handling of dialogs
|
2012-12-05 12:22:26 +01:00 |
|
David A. Velasco
|
8361540852
|
Fixed lack of File#getUsableSpace() in Android versions previous to GINGERBREAD
|
2012-12-04 14:36:49 +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
|
801d8922d3
|
Fixed bug: toast message infinitely repeated
|
2012-11-30 15:10:48 +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
|
b59784af89
|
No more NULL pointers from getDirectoryContent (2)
|
2012-11-30 13:33:23 +01:00 |
|
David A. Velasco
|
e81a7790eb
|
No more NULL pointers from getDirectoryContent
|
2012-11-30 13:28:00 +01:00 |
|
David A. Velasco
|
9f8814c557
|
Fixed bug: toast message infinitely repeated
|
2012-11-30 13:18:17 +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
|
a1c538db20
|
Some cleanup
|
2012-11-27 15:15:17 +01:00 |
|
David A. Velasco
|
fd9086a883
|
New policy: uploaded files are copied to the local storage ownCloud directory bu default
|
2012-11-27 14:28:19 +01:00 |
|
David A. Velasco
|
b83064eb83
|
Merge pull request #7 from Mic92/master
Fix Typos in DbHandler
|
2012-11-26 04:05:08 -08:00 |
|
David A. Velasco
|
a7cbc53251
|
Merge branch 'long_press'
|
2012-11-23 14:32:58 +01:00 |
|
David A. Velasco
|
ba52dfdf9d
|
Updated 'always download' item in context menu on list of files to 'download / refresh' item , such as in details view
|
2012-11-23 14:30:36 +01:00 |
|
David A. Velasco
|
e4bc3bdadc
|
Workaround to show hidden accents in options menu
|
2012-11-23 12:00:26 +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
|
3f2081e607
|
Ensure that FileDownloader and FileUploader events are not lost
|
2012-11-22 16:40:00 +01:00 |
|
David A. Velasco
|
60d0a121b7
|
Removal of a folder (or file) not already existing in the server is considered a success
|
2012-11-22 13:35:07 +01:00 |
|
David A. Velasco
|
658267ad79
|
Disable rename and remove actions on folders when some file is uploading or downloading inside
|
2012-11-22 13:06:54 +01:00 |
|
David A. Velasco
|
7fa9885738
|
Fixed crash when a folder is deleted while some of its contained files is downloading
|
2012-11-22 10:51:54 +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
|
6de96a9817
|
Fix conflict dialog to finish the container activity if BACK is pressed
|
2012-11-21 17:48:56 +01:00 |
|
David A. Velasco
|
ccb796173b
|
Fixed bug: renaming a folder could miss-update the storage path of children not-down files if a download file is in the folder
|
2012-11-21 16:28:20 +01:00 |
|
David A. Velasco
|
f03852032f
|
Fixed old bug reintroduced in instant uploads
|
2012-11-21 16:19:27 +01:00 |
|
David A. Velasco
|
70c663008b
|
Fixed rename of local copy of files
|
2012-11-21 14:48:34 +01:00 |
|
David A. Velasco
|
d0b7df16e7
|
Fixed database update due to renaming folders
|
2012-11-21 14:32:40 +01:00 |
|
David A. Velasco
|
db0e2d0186
|
Reviewed values set to OCFile#mLastSyncDateForData
|
2012-11-21 08:54:15 +01:00 |
|
David A. Velasco
|
9c3dc6d850
|
Fixed crash in initialization of FileObserverService
|
2012-11-20 14:48:44 +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
|
195b009212
|
Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device)
|
2012-11-20 14:12:32 +01:00 |
|
David A. Velasco
|
69ac5b6bfb
|
ConlictsResolveActivity is finished when the user cancels the ConflictsResolverDialog
|
2012-11-20 11:40:58 +01:00 |
|
David A. Velasco
|
3fd56ecff8
|
Fixed bug: inconsistency in isDown() state due to old OCFile object being saved in the OwnCloudFileObserver instances
|
2012-11-20 11:28:27 +01:00 |
|
David A. Velasco
|
9c38fbae1d
|
Buttons in details view are unlocked when after a failed 'refresh' click (due to server is down)
|
2012-11-20 11:00:56 +01:00 |
|
David A. Velasco
|
22a789e8d2
|
Fixed some bugs in the update of OCFile#mLastSyncDateForProperties at account synchronization time ; and some refactoring
|
2012-11-19 15:08:48 +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
|
3defb175cb
|
Bug fixed: download followed by refresh always resulted in upload, although the file was not changed
|
2012-11-16 10:28:46 +01:00 |
|
David A. Velasco
|
a7ee15e023
|
Renaming confussing token
|
2012-11-16 09:42:51 +01:00 |
|
David A. Velasco
|
97dd59063b
|
Fixed bug: when a file is checked as 'keep in sync' and the immediate synchronization results in an upload, when this finish the 'kepp in sync' check was being forgotten; not more
|
2012-11-15 19:29:30 +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
|
bd38627e14
|
Fixed lack of observance for files that are set as favourites when never were download before
|
2012-11-14 15:00:53 +01:00 |
|
David A. Velasco
|
b12ca42b45
|
Studying lack of upload when a file that was not previously down is set as favourite, then immediately opened and modified [WIP]
|
2012-11-13 16:01:13 +01:00 |
|
David A. Velasco
|
925a0554e5
|
Granted update of modificationTimestamp with the end of downloads and uploads
|
2012-11-13 15:59:05 +01:00 |
|
David A. Velasco
|
aef73a5263
|
Context handling made consistent
|
2012-11-13 11:38:00 +01:00 |
|
David A. Velasco
|
4460e43145
|
Grant that a favourite file in the device is watched if a redownload fails
|
2012-11-13 10:39:37 +01:00 |
|
David A. Velasco
|
e7b5284983
|
Remove observed file when requested although the list of observed had to be reinitialized
|
2012-11-13 10:26:35 +01:00 |
|
David A. Velasco
|
9aab2d26da
|
Fixed local path NULL when making favourite a file not down ; fixed change of local path for uploaded file when redownloading
|
2012-11-12 15:20:00 +01:00 |
|
David A. Velasco
|
85e9a40dbe
|
Fixed update of right fragment when actions in the context menu of the left fragment are completed, in large-landscape devices
|
2012-11-08 17:21:45 +01:00 |
|
David A. Velasco
|
405e801bf6
|
Fixed icon that toggles password visibility
|
2012-11-08 10:09:47 +01:00 |
|
David A. Velasco
|
0438f77560
|
More polite return for menus
|
2012-11-07 15:31:09 +01:00 |
|
David A. Velasco
|
ac6b3d25ac
|
Open, download and cancel operations linked to contextual menu for files
|
2012-11-07 14:17:58 +01:00 |
|
Bartek Przybylski
|
0348e3df37
|
increase synchronization period to 24h
|
2012-11-06 16:51:42 +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
|
1baa27a440
|
Rename of folders completed (by now)
|
2012-11-06 13:35:08 +01:00 |
|
David A. Velasco
|
b27ebf0310
|
Removal of folders completed
|
2012-11-05 15:44:09 +01:00 |
|
Jörg Thalheim
|
2befbc8914
|
fix typo in classname: OpenerHepler -> OpenerHelper
|
2012-10-31 19:27:11 +01:00 |
|
Jörg Thalheim
|
3aaae90b9b
|
fix typo in database schema
|
2012-10-31 19:24:35 +01:00 |
|
David A. Velasco
|
cab55a8edd
|
Login page updated to get OAuth2 access token
|
2012-10-31 18:59:43 +01:00 |
|
David A. Velasco
|
463194d0b4
|
Merge remote-tracking branch 'origin/master' into long_press
|
2012-10-31 17:52:28 +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 |
|
Bartek Przybylski
|
cce7e1247a
|
assign octet-stream mimetype to unknown type file
|
2012-10-30 22:36:50 +01:00 |
|
David A. Velasco
|
4ee11fa748
|
Fixed folder detection, now WebDAV compliant
|
2012-10-30 11:24:09 +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
|
47acd9b4c3
|
Remove locking of readonly channel
|
2012-10-28 10:24:27 +01:00 |
|
Bartek Przybylski
|
92080afefc
|
add licence header to files
|
2012-10-28 00:12:15 +02:00 |
|
Bartek Przybylski
|
0f1065e53a
|
upload file only on write close
|
2012-10-27 21:55:24 +02:00 |
|
Bartek Przybylski
|
6c32365704
|
Solving modified date and length conflicts
|
2012-10-27 12:20:52 +02:00 |
|
David A. Velasco
|
7ebcda4d81
|
Increased chunk size up to 1MB
|
2012-10-26 15:42:05 +02:00 |
|
David A. Velasco
|
30c934fe37
|
Character % is rejected for names of files when renaming
|
2012-10-26 13:49:03 +02:00 |
|
David A. Velasco
|
c6a3abf05b
|
No more Canonical Names in log TAGs
|
2012-10-26 13:45:59 +02:00 |
|
David A. Velasco
|
5af0fb44b4
|
Refactored renaming operation (inherits RemoteOperation, so generates RemoteOperationResult)
|
2012-10-26 11:34:20 +02:00 |
|
David A. Velasco
|
2c04c31d90
|
Removed unused class ConnectionCheckerRunnable, and moved ConnectionCheckOperation to .operations package
|
2012-10-25 16:01:29 +02:00 |
|
David A. Velasco
|
900563e245
|
Refactored remove file operation (inherits RemoteOperation, so generates RemoteOperationResult)
|
2012-10-25 14:21:01 +02:00 |
|
David A. Velasco
|
d5a327c342
|
Merge two-way synch changes with synch-service refactoring for SSL warning
|
2012-10-25 10:41:24 +02:00 |
|
David A. Velasco
|
d25af7eea5
|
Changed the synchronization process to limit the number and type of failures supported before stop
|
2012-10-24 19:39:55 +02:00 |
|
David A. Velasco
|
808d2a74ab
|
Updating synchronization for providing SSL warning when necessary; STEP 2: added SSL warning dialog in FileDisplayActivity
|
2012-10-23 15:35:47 +02:00 |
|
David A. Velasco
|
6e469559c5
|
Updating synchronization for providing SSL warning when necessary; step 1: refactoring based in RemoteOperation (DONE)
|
2012-10-23 12:47:29 +02:00 |
|
Bartek Przybylski
|
de94751cde
|
Two way synchronization for files
|
2012-10-22 21:15:26 +02:00 |
|
David A. Velasco
|
1192e036ce
|
Updating synchronization for providing SSL warning when necessary; step 1: refactoring based in RemoteOperation (STILL IN PROGRESS)
|
2012-10-22 15:38:37 +02:00 |
|
David A. Velasco
|
67eb921007
|
Updating synchronization for providing SSL warning when necessary; step 1: refactoring based in RemoteOperation (in progress)
|
2012-10-22 15:11:59 +02:00 |
|
David A. Velasco
|
9faab34fbd
|
Fixed notifications bug: when several notifications (download and upload, for instance) lived at the same time, clicking any of them resulted in the action expected for the last one; no more
|
2012-10-19 13:08:58 +02:00 |
|
David A. Velasco
|
5c0faf237d
|
Fixed error in first synchronization, once again
|
2012-10-18 19:11:59 +02:00 |
|
David A. Velasco
|
2bef10d847
|
Undone the background message in empty folders
|
2012-10-18 10:53:47 +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
|
0bb59e0f9b
|
Keep the same item in the CENTER of the files list when the device is turned to other position
|
2012-10-17 13:45:19 +02:00 |
|
David A. Velasco
|
d193e0031b
|
Added explanation in the view for PIN Code creation
|
2012-10-17 11:04:27 +02:00 |
|
David A. Velasco
|
cf27417e54
|
Fixed crash got when instant upload is tried to an account where the InstantUpload/ folder is not already created
|
2012-10-15 15:22:07 +02:00 |
|
David A. Velasco
|
d6ccd4c960
|
Moved recursive fetch to notify end-of-syncrhonization of a folder BEFORE its children are synchronized
|
2012-10-15 13:14:46 +02:00 |
|
David A. Velasco
|
c7a2866454
|
Fixed problem in first-ever synchronization introduced while refactoring list adapters
|
2012-10-15 12:57:14 +02:00 |
|
David A. Velasco
|
27112bd200
|
Cancellation in uploads and access to details view pressing the status notification
|
2012-10-11 16:40:56 +02:00 |
|
David A. Velasco
|
b0ab3ce087
|
Merge remote-tracking branch 'origin/master' into cancel_in_upload
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2012-10-11 11:40:15 +02:00 |
|
David A. Velasco
|
7fead3cb22
|
Fixing NULL pointer in execution without accounts created
|
2012-10-11 11:33:13 +02:00 |
|
David A. Velasco
|
5fc7cd13e7
|
Adding cancellation to uploads (WIP)
|
2012-10-11 11:24:17 +02:00 |
|
Bartek Przybylski
|
6c91968a23
|
fixup! get oc server version on synchronization
|
2012-10-10 22:55:24 +02:00 |
|
Bartek Przybylski
|
8f5ed4195a
|
get oc server version on synchronization
|
2012-10-10 22:52:26 +02:00 |
|
Bartek Przybylski
|
4e1aafdafc
|
fixup! instant upload via wifi only - fixes
|
2012-10-10 22:08:13 +02:00 |
|
David A. Velasco
|
7382fa84b0
|
Fixed update of double pane view when download in notification bar is pressed in landspace mode
|
2012-10-10 16:18:11 +02:00 |
|
David A. Velasco
|
b416f87c92
|
Fixed crash when download notification is pressed in landscape mode
|
2012-10-10 13:45:04 +02:00 |
|
David A. Velasco
|
25f307c98a
|
Show the details of a file when the status notification of a download in progress is clicked
|
2012-10-10 13:13:22 +02:00 |
|
David A. Velasco
|
b246cf7075
|
Improved cancellation of downloads: fast abort of operation and fixed thread synchronization
|
2012-10-10 11:30:47 +02:00 |
|
Bartek Przybylski
|
b6eb63a472
|
chaning photo taken name for more descriptive
|
2012-10-09 23:26:53 +02:00 |
|
Bartek Przybylski
|
5bb706e8ac
|
instant upload via wifi only - fixes
|
2012-10-09 22:53:41 +02:00 |
|
David A. Velasco
|
38512099c4
|
Merge remote-tracking branch 'origin/master'
|
2012-10-09 14:54:14 +02:00 |
|
David A. Velasco
|
68ce2e7a38
|
Download service refactoring: multiple downloads and cancellation support
|
2012-10-09 14:53:25 +02:00 |
|
Bartek Przybylski
|
671cb91cef
|
add upload via wifi only option
|
2012-10-08 21:26:18 +02:00 |
|
David A. Velasco
|
76ba00b2b2
|
Cancellation of current download in details view - UI changes
|
2012-10-08 09:03:12 +02:00 |
|
David A. Velasco
|
557126eecf
|
Fixed crash by ArrayOutOfBoundsException and general review of methods in FileListListAdapter
|
2012-10-04 08:56:48 +02:00 |
|
David A. Velasco
|
a2d4e98a7e
|
Files list position is kept when the orientation changes
|
2012-10-03 16:48:06 +02:00 |
|
Bartek Przybylski
|
981bf05434
|
remove all warning from project
|
2012-09-29 23:55:19 +02:00 |
|
Bartek Przybylski
|
aa14479e5b
|
removing some obvious warnings as first step to -Werror
|
2012-09-29 23:17:39 +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
|
8eae3a2be5
|
Favourites disabled until fix can be pushed
|
2012-09-14 14:27:50 +02:00 |
|
David A. Velasco
|
eda7243130
|
Fixed crash when the device is turned while the warning dialog about server certificates is shown
|
2012-09-14 11:33:25 +02:00 |
|
David A. Velasco
|
afe0c37158
|
Fixed null pointer in connection check
|
2012-09-13 18:54:24 +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
|
bf3cf8cdff
|
Server certificates improvements: fixed problems in devices with OpenSSL implementations 'forgetting' CertificateExceptions ; and removed useless workaround for Android 2.x
|
2012-09-13 17:07:17 +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
|
f3d61ef578
|
Fixed the lack of warning when a non trusted SSL certificate is found if the user creates a new account without the protocol prefix in the URL and both HTTPS and HTTP are available in the server
|
2012-09-10 10:53:11 +02:00 |
|
David A. Velasco
|
3b0692cb38
|
Fixed crashes due to send invalid contents (nulls) to the multiple upload activity from other apps
|
2012-09-10 10:39:27 +02:00 |
|
David A. Velasco
|
261aaf5001
|
Improvements in SSL certifcates checking: URL is checked with the hostname in the certificate and all the problems are shown in the same dialog
|
2012-09-07 14:11:08 +02:00 |
|
David A. Velasco
|
301b2760ba
|
Fixed java.lang.ClassCastException entered in the previous update
|
2012-09-05 16:02:42 +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 |
|
David A. Velasco
|
91bc3fdb1e
|
Added notification for failures in manual synchronizations; some improvements in the management of exceptions occurred while synchronizing (more TODO)
|
2012-08-23 17:09:05 +02:00 |
|
David A. Velasco
|
11117ace15
|
Granted update of file list view after removing the currently selected account from 'manage accounts' activity
|
2012-08-23 11:28:40 +02:00 |
|
Bartek Przybylski
|
b2a260286e
|
proper reinitialize of service
|
2012-08-22 21:20:38 +02:00 |
|
Bartek Przybylski
|
ba148a8278
|
complete two way synchronization
|
2012-08-22 19:33:22 +02:00 |
|
David A. Velasco
|
fbd720e887
|
Fixing rare crashes in the login page
|
2012-08-22 16:05:32 +02:00 |
|
David A. Velasco
|
4e57c008b7
|
Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI
|
2012-08-22 13:53:03 +02:00 |
|
David A. Velasco
|
938c78466b
|
Local files are protected against removal because of synchronization when out of the owncloud folder
|
2012-08-22 12:50:06 +02:00 |
|
David A. Velasco
|
34687403f4
|
Updated default timeout for data
|
2012-08-22 12:49:00 +02:00 |
|
David A. Velasco
|
ceb3dfdd05
|
More robust instant photo uploads
|
2012-08-22 10:48:16 +02:00 |
|
David A. Velasco
|
081b333eb1
|
Added link to register a new user at owncloud.com ; fixed cancel button in account creation for SGS3
|
2012-08-20 14:36:46 +02:00 |
|
Bartek Przybylski
|
1f57ae3b1e
|
update image when list element is touched
this is required from introduction of project butter
before that view was invalidated on any action, which
was slowing down UI
|
2012-08-18 12:02:21 +02:00 |
|
David A. Velasco
|
1b2a3581ff
|
Fixing setting of socket timeout in HTTPS connections
|
2012-08-17 14:28:46 +02:00 |
|
David A. Velasco
|
b5e8b4bde5
|
Changed value for default timeouts
|
2012-08-17 14:27:01 +02:00 |
|
David A. Velasco
|
99d52af203
|
Refactoring of WebdavClient creation and setup
|
2012-08-16 16:06:12 +02:00 |
|
David A. Velasco
|
1ecd2b61c5
|
Multiple upload available from the app
|
2012-08-14 12:37:08 +02:00 |
|
David A. Velasco
|
f4b82b1a92
|
Removed useless file
|
2012-08-08 12:36:38 +02:00 |
|
David A. Velasco
|
58ebd9d7e1
|
FIleDisplayActivity refactored to fix view never updated after installation in some devices and problems when all the accounts are deleted
|
2012-08-08 12:30:11 +02:00 |
|
David A. Velasco
|
67771a6708
|
Extra logs for debugging connections
|
2012-08-03 14:01:42 +02:00 |
|
David A. Velasco
|
6ef3fa77ef
|
Added forgotten trim()s on the content of the URL field
|
2012-08-03 12:56:50 +02:00 |
|
David A. Velasco
|
532492bf9b
|
Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact.
|
2012-08-03 11:39:08 +02:00 |
|
David A. Velasco
|
38ece35da5
|
Fixed crash by URL with whitespaces in login page; reviewed error handling and user info in connection checking
|
2012-08-02 13:28:33 +02:00 |
|
David A. Velasco
|
fa6d145f91
|
Details view is quited when browsing to the parent folder
|
2012-08-01 11:20:42 +02:00 |
|
David A. Velasco
|
6b765c7ad2
|
Updated some minor strings with the new app package
|
2012-08-01 10:00:43 +02:00 |
|
Bartek Przybylski
|
a4ba6170ea
|
moving from eu.alefzero.eu to com.owncloud.android
|
2012-07-31 17:43:37 +02:00 |
|
David A. Velasco
|
a20681b063
|
No more 'secure icon' when secure connection is NOT available
|
2012-07-31 14:02:03 +02:00 |
|
David A. Velasco
|
9da82f797e
|
Fixed lost of track of a downloaded file when it's tried to be renamed but the operation fails
|
2012-07-31 13:09:55 +02:00 |
|
David A. Velasco
|
6a9eaaf9aa
|
Better failure handling in files renaming and removal
|
2012-07-30 15:11:59 +02:00 |
|
David A. Velasco
|
76a123fc35
|
Added failure handling to directory creation
|
2012-07-30 14:06:53 +02:00 |
|
David A. Velasco
|
c06007b98a
|
Granted that accounts different only in port number won't mix their files in the same local folder
|
2012-07-30 12:02:34 +02:00 |
|
David A. Velasco
|
e8852fa725
|
Fixed compatibility issue in local deletion and text typo
|
2012-07-30 09:46:24 +02:00 |
|
Bartek Przybylski
|
0cced280a4
|
allow removing local file only
|
2012-07-28 21:15:41 +02:00 |
|
David A. Velasco
|
7c93676d6f
|
Make resource values for some hardcoded string
|
2012-07-27 15:02:03 +02:00 |
|
David A. Velasco
|
275eb1f8f8
|
Fixed: problems in handling a file that is still uploading but in the files list because a synchronization was triggered and finished; problems in UI refresh after removing or renaming a file, while in double pane mode
|
2012-07-27 14:29:46 +02:00 |
|
David A. Velasco
|
f3ba107585
|
Upload improvements: better control of errors, updated use of status notifications, removed toast notifications, new isUploading(...) mehtod
|
2012-07-26 18:35:09 +02:00 |
|
David A. Velasco
|
cd0886d3ca
|
Pin code number hidden as a password
|
2012-07-26 13:08:14 +02:00 |
|
David A. Velasco
|
a032bdeebc
|
Quick patch to fix operations not ready for HTTPS
|
2012-07-26 10:44:24 +02:00 |
|
David A. Velasco
|
cc313d2e48
|
File list is updated when a file contained in the current directory finished its download although it wasn't successful
|
2012-07-25 18:39:14 +02:00 |
|
David A. Velasco
|
ba5785e09f
|
Fixed bad synchronization of files removed from another client; checked that condition removed is not necessary in any case
|
2012-07-25 14:39:46 +02:00 |
|
David A. Velasco
|
d8e29ce306
|
Updated logging for login ;)
|
2012-07-25 13:29:14 +02:00 |
|
David A. Velasco
|
81970c8131
|
Reviewed error handling and notifications in downloads
|
2012-07-25 12:04:08 +02:00 |
|
David A. Velasco
|
393bcd6869
|
FIxed null pointer exception when a file details view receives a message from the download service
|
2012-07-25 08:34:39 +02:00 |
|
David A. Velasco
|
a238d0635a
|
Added a static list of downloads in progress to have a reliable way to check if a file is downloading
|
2012-07-24 14:08:54 +02:00 |
|
David A. Velasco
|
9d3208ea03
|
Explicit default values for network timeouts; fixed null pointer in message broadcasted when a download can't finish
|
2012-07-24 13:04:58 +02:00 |
|
Bartek Przybylski
|
7f75f13f0c
|
make confirmation dialog more universal
|
2012-07-23 19:09:44 +02:00 |
|
David A. Velasco
|
c82fc04aea
|
Fixed cancel button in PIN code activity
|
2012-07-23 14:53:46 +02:00 |
|
David A. Velasco
|
4b8e26b287
|
Fixing bad reference to string
|
2012-07-23 14:49:09 +02:00 |
|
David A. Velasco
|
eb2a7bcec2
|
Replaced strings in two pieces with formatted string
|
2012-07-23 14:38:16 +02:00 |
|
David A. Velasco
|
6f189bffe1
|
Downloads through temporal file and better OCFile.isDownloading() and .isDown() implementation
|
2012-07-23 13:55:58 +02:00 |
|
David A. Velasco
|
8ba2ca7b85
|
Filter broadcast messages in receivers with the account, to avoid problems with services ongoing after the current account is changed
|
2012-07-23 12:47:58 +02:00 |
|
David A. Velasco
|
3e2d5f40b4
|
Fix the local file name saved in database when a file is renamed
|
2012-07-23 11:07:59 +02:00 |
|
David A. Velasco
|
3a34911f3b
|
Rename file to upload to avoid overwrites in server
|
2012-07-23 10:13:50 +02:00 |
|
Bartek Przybylski
|
53bc15cdbf
|
allow username with @, hide search menu item until sherlockactionbar wont put it to master
|
2012-07-22 09:01:22 +02:00 |
|
David A. Velasco
|
d2f2500bdd
|
Handling of PUT response code fixed
|
2012-07-20 13:30:04 +02:00 |
|
David A. Velasco
|
ff0803c3ee
|
Avoid crash in the login page when the connections is tested, then changed to other wrong URL and connect is clicked before the new test finishes
|
2012-07-20 12:27:05 +02:00 |
|
David A. Velasco
|
2a04c6ae5d
|
Some fixes about downloads and how the detals view and list view is updated when downloads start and finish
|
2012-07-20 10:13:50 +02:00 |
|
David A. Velasco
|
3cf90ff17d
|
More fixes to PIN Code activity
|
2012-07-19 11:51:05 +02:00 |
|
David A. Velasco
|
611fe1e4b5
|
Enable preemptive authentication to avoid double send of files in uploading
|
2012-07-19 11:34:51 +02:00 |
|
Bartek Przybylski
|
f8e0f7a582
|
use star instead of heart, download while if its marked as favorite,ignoring last update
|
2012-07-19 00:04:37 +02:00 |
|
David A. Velasco
|
935a7b0934
|
Fixed null pointer in synchronization
|
2012-07-18 14:38:02 +02:00 |
|
David A. Velasco
|
cffdf90bf3
|
Added timeout to the connection test; timeoutted methods granted for HTTPS
|
2012-07-18 14:20:09 +02:00 |
|
David A. Velasco
|
153dbb0342
|
Be sure that root directoriy is listed when the synchronization is really fast
|
2012-07-17 15:28:27 +02:00 |
|
David A. Velasco
|
0583bc8b33
|
Pin code messages update
|
2012-07-17 15:16:27 +02:00 |
|
David A. Velasco
|
463b30c46a
|
Avoid crashes when an external app makes a bad response for the selection of a file to upload
|
2012-07-17 14:51:36 +02:00 |
|
David A. Velasco
|
45f89711be
|
Fixed problem with some special characters when opening files; renamed WebdavUtils.encode to WebdavUtils.encodePath; fixed null pointer exception in preview
|
2012-07-17 14:26:18 +02:00 |
|
David A. Velasco
|
c6b553f635
|
OCFile stores again decoded remote paths; WebdavUtils.encode(...) added; fixed space conversion in paths in multiple uploads; CLEAN THE APPLICATION CACHE AFTER INSTALLING
|
2012-07-17 12:59:15 +02:00 |
|
David A. Velasco
|
400a17d3e3
|
Cancellable synchronization; current synchronizations are cancelled when the user request for a synchronization in the options menu
|
2012-07-16 15:06:03 +02:00 |
|
David A. Velasco
|
424164206f
|
Merge branch 'testing_cancel_sync'
|
2012-07-16 13:04:38 +02:00 |
|
David A. Velasco
|
4f2f33c9bc
|
Being careful with regressions
|
2012-07-16 13:01:18 +02:00 |
|
David A. Velasco
|
e184646912
|
More fixes to PIN Code
|
2012-07-16 12:59:25 +02:00 |
|
David A. Velasco
|
0f2376806f
|
Testing synchronization cancelation
|
2012-07-16 12:54:18 +02:00 |
|
David A. Velasco
|
c0645e6832
|
Trigger synchronization when current account is changed; remove redundant accounts list in preferences
|
2012-07-16 11:34:37 +02:00 |
|
David A. Velasco
|
91b1728493
|
More fixes to PIN code
|
2012-07-13 14:46:40 +02:00 |
|
David A. Velasco
|
c5d5b9d1d2
|
Still better for progress circle initialization: looks like apply it after setContentView(..) has the best result
|
2012-07-13 11:14:10 +02:00 |
|
David A. Velasco
|
f40fe2c985
|
Avoid the progress circle is visible when starting the app after updating it in the device
|
2012-07-13 10:10:58 +02:00 |
|
Bartek Przybylski
|
0d4f5d38c3
|
make preview a bit smaller than screen width
|
2012-07-12 22:26:33 +02:00 |
|
Bartek Przybylski
|
147227040b
|
reduce permissions, optimize bitmap displaying
|
2012-07-12 22:02:30 +02:00 |
|
Bartek Przybylski
|
90161386e2
|
load bitmap asynchronously on preview
|
2012-07-12 19:52:56 +02:00 |
|
David A. Velasco
|
1dbc69dc11
|
Avoid double query to the ContentResolver when listing the contents of a folder
|
2012-07-12 17:49:29 +02:00 |
|
David A. Velasco
|
50d8905f00
|
File removal in server completed
|
2012-07-12 13:49:21 +02:00 |
|
David A. Velasco
|
8b24606331
|
Fixed confirmation dialog for deletion
|
2012-07-12 10:55:47 +02:00 |
|
David A. Velasco
|
4340d4f6e4
|
Compatibility fix in renaming for Android API < 12
|
2012-07-12 10:17:32 +02:00 |
|
David A. Velasco
|
6701c9842d
|
Delete remote file - confirmation dialog added
|
2012-07-12 09:48:55 +02:00 |
|
Bartek Przybylski
|
f2b890ae53
|
update local filename only when rename succeed
|
2012-07-11 20:25:27 +02:00 |
|
David A. Velasco
|
f757b74ced
|
Some fixes to PIN code
|
2012-07-11 18:59:59 +02:00 |
|
David A. Velasco
|
f692bf7ae6
|
Merge branch 'master', remote-tracking branch 'origin'
|
2012-07-11 18:47:27 +02:00 |
|
Bartek Przybylski
|
a70c4c658f
|
addming missing file, show softkeyborad on pin activity and change name activity
|
2012-07-11 17:23:50 +02:00 |
|
David A. Velasco
|
d4f8391f50
|
Trying to improve synchronization performance with database batched operations
|
2012-07-11 13:51:57 +02:00 |
|
Bartek Przybylski
|
02610cad7d
|
messy rename file
|
2012-07-10 22:52:31 +02:00 |
|
Bartek Przybylski
|
a9a1ad71e9
|
delete file after download failed, correctly send message about download fail
|
2012-07-10 18:07:05 +02:00 |
|
Bartek Przybylski
|
233553a081
|
dont loose keep in sync state when syncing
|
2012-07-09 17:16:56 +02:00 |
|
David A. Velasco
|
de5d818781
|
Strings extracted from PinCodeActivity to resources
|
2012-07-09 15:19:44 +02:00 |
|
David A. Velasco
|
3e4f8b4f0d
|
Better policy to show PIN Code
|
2012-07-09 15:10:26 +02:00 |
|
David A. Velasco
|
271a4ba1df
|
Avoid null pointer exception when the details fragment is empty
|
2012-07-09 14:24:13 +02:00 |
|
David A. Velasco
|
cbf9ca8bea
|
Merge remote-tracking branch 'origin/master' into moresync
|
2012-07-09 11:28:51 +02:00 |
|
David A. Velasco
|
a48014bffd
|
More improvements in refresh files list while synchronizing
|
2012-07-09 11:23:56 +02:00 |
|
David A. Velasco
|
93de9f91d5
|
Pin code
|
2012-07-09 11:11:44 +02:00 |
|
David A. Velasco
|
146f7969b3
|
Better backwards compatibility in crash logger and images preview
|
2012-07-09 09:39:32 +02:00 |
|
David A. Velasco
|
15a2d8b8e6
|
Fixed bug in creation of database after adding keep_in_sync column
|
2012-07-09 09:23:42 +02:00 |
|
Bartek Przybylski
|
f2a79ec8fd
|
create keep in sync field in db on app setup
|
2012-07-09 07:24:28 +02:00 |
|
Bartek Przybylski
|
3113c45909
|
keep file in sync and initial commit for file sharing
|
2012-07-08 16:57:48 +02:00 |
|
David A. Velasco
|
461364f68b
|
Some improvements in synchronization and refresh of directory list
|
2012-07-06 15:09:13 +02:00 |
|
David A. Velasco
|
9b9b02c384
|
Avoid use of queues to delay recursion
|
2012-07-06 09:27:01 +02:00 |
|
David A. Velasco
|
494ebd608f
|
Fixing null pointers when finding out MIME types from extensions
|
2012-07-05 16:38:59 +02:00 |
|
David A. Velasco
|
93983377cc
|
Explicit assingment of infinite timeout for uploads and downloads; delete local file when download can't finish
|
2012-07-05 15:51:32 +02:00 |
|
David A. Velasco
|
890bf7fa51
|
Completing previous commit
|
2012-07-05 12:05:00 +02:00 |
|
David A. Velasco
|
8d3b028e72
|
FileDetailFragment is not reused in double pane view to avoid problems with preview-imaegs and buttons refresh
|
2012-07-05 11:54:12 +02:00 |
|
David A. Velasco
|
f9c951ec9a
|
Ensure that synchronization indicator in the files list is stopped if unexepected problems interrupt the synchronization
|
2012-07-04 15:51:17 +02:00 |
|
David A. Velasco
|
882668c5d9
|
Small improvements to the refresh of the files list and memory handling while synchronization is running
|
2012-07-04 15:44:59 +02:00 |
|
David A. Velasco
|
7c2174d09e
|
Refactoring of main Activities and Fragments to avoid inconsistent states leading to crashes, specially in tablet devices
|
2012-07-04 14:38:52 +02:00 |
|
David A. Velasco
|
c3482e1fd0
|
Fixed silly bugs introduced when trying to improve list refresh while synchronization
|
2012-07-04 10:23:07 +02:00 |
|
David A. Velasco
|
147d2acdd6
|
Cleaned up activities over FileDisplayActivity when current account is changed to avoid problems with BACK button
|
2012-07-04 10:17:29 +02:00 |
|
Lennart Rosam
|
43da474a54
|
Initial version of FileOperation to encapsulate all events regarding
this
|
2012-07-04 01:37:46 +02:00 |
|
Lennart Rosam
|
75df6eccdf
|
Remove version specific check as we do not know when this will be fixed.
|
2012-07-04 01:37:06 +02:00 |
|
Lennart Rosam
|
a50d17dcb6
|
Small fixes on delete
|
2012-07-04 01:31:05 +02:00 |
|
Lennart Rosam
|
eb1c63d3dc
|
Singleton didn't work (worth a try though ^^) - Make a new constructor
instead
|
2012-07-04 01:06:27 +02:00 |
|
Lennart Rosam
|
5282400a10
|
tryToLogin must get parameters now
|
2012-07-04 00:47:31 +02:00 |
|
Lennart Rosam
|
c65a0e142c
|
+selfSigned
|
2012-07-04 00:29:53 +02:00 |
|
Lennart Rosam
|
c6e343964a
|
WebdavClient singleton - make client management less complicated
|
2012-07-04 00:29:03 +02:00 |
|
Bartek Przybylski
|
54539939f3
|
disable download button while downloading
|
2012-07-02 18:28:31 +02:00 |
|
Bartek Przybylski
|
054180baa7
|
dont show creation date until its fixed
|
2012-07-02 18:07:28 +02:00 |
|
David A. Velasco
|
16b5c6b9ad
|
Merge remote-tracking branch 'origin/master'
|
2012-07-02 10:42:07 +02:00 |
|
David A. Velasco
|
41f2cf1169
|
Download failures not treated as successes
|
2012-07-02 10:41:56 +02:00 |
|
Bartek Przybylski
|
1e63d71c91
|
Merge branch 'master' of gitorious.org:owncloud/android-devel
|
2012-06-30 13:51:31 +02:00 |
|
David A. Velasco
|
d6205749eb
|
Added dynamic update of files list while full synchronization is performed
|
2012-06-29 15:16:19 +02:00 |
|
David A. Velasco
|
1f0fc5470a
|
Merge remote-tracking branch 'origin/master'
|
2012-06-29 10:36:31 +02:00 |
|
David A. Velasco
|
72141b60fb
|
Update of messages when uploads finish
|
2012-06-29 10:36:25 +02:00 |
|
Lennart Rosam
|
2e247f24bf
|
Merge branch 'master' of ssh://gitorious.org/owncloud/android-devel
|
2012-06-28 14:49:54 +02:00 |
|