Luke Owncloud
|
2d0c347bc4
|
Merge remote-tracking branch 'upstream/develop' into HEAD
Conflicts:
owncloud-android-library
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2014-12-08 16:24:10 +01:00 |
|
Jenkins for ownCloud
|
cd883c67f7
|
[tx-robot] updated from transifex
|
2014-12-08 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
dac3ced86d
|
[tx-robot] updated from transifex
|
2014-12-07 01:13:35 -05:00 |
|
Jenkins for ownCloud
|
940f0cc89c
|
[tx-robot] updated from transifex
|
2014-12-06 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
c7c53c93ba
|
[tx-robot] updated from transifex
|
2014-12-05 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
da691e0bfd
|
[tx-robot] updated from transifex
|
2014-12-04 01:13:37 -05:00 |
|
David A. Velasco
|
50e39f044f
|
Merge branch 'master' into develop
|
2014-12-03 11:31:49 +01:00 |
|
jabarros
|
d58d6ca4d0
|
Merge pull request #773 from owncloud/triggerMediaScan
Trigger media scan
|
2014-12-03 10:10:26 +01:00 |
|
David A. Velasco
|
f139a7204d
|
Removed empty method, and some unused imports
|
2014-12-03 09:41:49 +01:00 |
|
jabarros
|
bad9f30115
|
Merge branch 'release-1.6.2'
|
2014-12-03 09:33:07 +01:00 |
|
jabarros
|
dfb2dc0a32
|
Update owncloud library reference to 0.9.4
|
2014-12-03 09:31:41 +01:00 |
|
David A. Velasco
|
1e9ff8c5fa
|
Trigger MediaScan for every downloaded file in a renamed or moved folder
|
2014-12-02 14:23:49 +01:00 |
|
David A. Velasco
|
5167e646ad
|
Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile
|
2014-12-02 13:33:57 +01:00 |
|
David A. Velasco
|
0f39ff841a
|
Bug fixed (and some refactoring): crash on local removal of a folder
|
2014-12-02 11:17:47 +01:00 |
|
David A. Velasco
|
c20d7ef4ad
|
Let Gradle out of Travis for the moment - needs additional review
|
2014-12-02 09:47:02 +01:00 |
|
David A. Velasco
|
2717c2a219
|
Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment
|
2014-12-02 09:29:26 +01:00 |
|
David A. Velasco
|
87f911c1ed
|
Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager
|
2014-12-02 09:21:35 +01:00 |
|
David A. Velasco
|
e771c09ad9
|
Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method
|
2014-12-02 09:16:56 +01:00 |
|
David A. Velasco
|
c95eb327f8
|
Refactoring: get MediaScan trigger out of OCFile for renaming
|
2014-12-02 09:08:55 +01:00 |
|
jabarros
|
0a0c808e3b
|
Merge pull request #662 from tobiasKaminsky/fileCount
File count
|
2014-12-02 08:31:54 +01:00 |
|
Luke Owncloud
|
30f9abb657
|
comment
|
2014-12-01 08:24:26 +01:00 |
|
Luke Owncloud
|
82c7771fc7
|
comments and less debug output
|
2014-12-01 08:17:40 +01:00 |
|
Luke Owncloud
|
6ce811228a
|
fix GUI options
|
2014-12-01 07:56:04 +01:00 |
|
Luke Owncloud
|
99d82430c5
|
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
Conflicts:
SETUP.md
owncloud-android-library
src/com/owncloud/android/datamodel/OCFile.java
|
2014-12-01 07:43:56 +01:00 |
|
Luke Owncloud
|
982befe542
|
fix GUI output
|
2014-11-30 21:22:51 +01:00 |
|
Luke Owncloud
|
34b630bcf9
|
fix store upload debug msg
|
2014-11-30 21:21:17 +01:00 |
|
Luke Owncloud
|
0ff6921665
|
git added filesize
improving status messages
|
2014-11-30 20:18:27 +01:00 |
|
Luke Owncloud
|
142b894a7e
|
display complete LATER reason
|
2014-11-30 19:33:21 +01:00 |
|
Luke Owncloud
|
74284856b9
|
remove not needed service looper
|
2014-11-30 18:11:24 +01:00 |
|
Luke Owncloud
|
3dacd2436d
|
update db when retrying upload
allow LATER upload to be cancelled
|
2014-11-30 15:17:40 +01:00 |
|
Luke Owncloud
|
9e6d8c1b58
|
set charging only default to false
add message for LATER status
enable retry option for all not-succeeded uploads
|
2014-11-30 15:05:18 +01:00 |
|
tobiasKaminsky
|
eaa3b1ef56
|
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
-fr/strings.xml
Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
|
2014-11-29 12:18:02 +01:00 |
|
tobiasKaminsky
|
e8a4780cbc
|
- test fix for android 4
|
2014-11-29 12:13:46 +01:00 |
|
tobiasKaminsky
|
0809b821e8
|
- restore some files :/
|
2014-11-29 11:32:00 +01:00 |
|
tobiasKaminsky
|
12f515936d
|
Temporary fix of missing escape for apostrophe
|
2014-11-29 11:28:21 +01:00 |
|
tobiasKaminsky
|
9fcba0b801
|
cleanup
|
2014-11-29 11:23:16 +01:00 |
|
tobiasKaminsky
|
95967c2151
|
- trigger mediaScan when files are deleted remote
|
2014-11-29 11:12:03 +01:00 |
|
tobiasKaminsky
|
cb9927fb00
|
- trigger works when moving files
|
2014-11-29 10:37:13 +01:00 |
|
jabarros
|
b2af9efa78
|
Merge pull request #768 from owncloudChalmers/owncloud_submodule
Change submodule from owncloudChalmers/android-library to owncloud/android-library
|
2014-11-28 14:25:32 +01:00 |
|
Luke Owncloud
|
9445692878
|
fix cancel upload
add remove single upload from list
add retry upload
|
2014-11-28 14:01:19 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
37a374df58
|
Change submodule from owncloudChalmers/android-library to ownCloud/android-library
|
2014-11-28 12:16:34 +01:00 |
|
Luke Owncloud
|
4518da5d03
|
fix progress notifications
fix handling multiple uploads with same filepath key
|
2014-11-28 11:20:11 +01:00 |
|
jabarros
|
b80060f941
|
Update owncloud library reference
|
2014-11-28 10:55:39 +01:00 |
|
jabarros
|
9990eb9495
|
Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency
Gradle support (squashed history)
|
2014-11-28 09:10:45 +01:00 |
|
Jenkins for ownCloud
|
37713d798b
|
[tx-robot] updated from transifex
|
2014-11-28 01:13:32 -05:00 |
|
Luke Owncloud
|
7d2f573f6d
|
added debug output
|
2014-11-27 17:03:48 +01:00 |
|
Luke Owncloud
|
86eccab464
|
show details on simple click
|
2014-11-27 16:52:17 +01:00 |
|
Luke Owncloud
|
cf63d7ce0e
|
remove on long click, add context menu instead
|
2014-11-27 16:40:52 +01:00 |
|
Luke Owncloud
|
397dd7b5b2
|
fix on click handler
added on long click handler
|
2014-11-27 15:56:09 +01:00 |
|
Luke Owncloud
|
eaab185720
|
introduce divisions in upload list view
|
2014-11-27 14:26:31 +01:00 |
|