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 |
|
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 |
|
Jorge Antonio Diaz-Benito Soriano
|
37a374df58
|
Change submodule from owncloudChalmers/android-library to ownCloud/android-library
|
2014-11-28 12:16:34 +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 |
|
Jorge Antonio Diaz-Benito Soriano
|
9764f939f5
|
Update the submodule version to the restored .gitignore
|
2014-11-25 21:34:20 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
69013b0e8d
|
Restore .gitignore and SETUP.md, remove files that were added
|
2014-11-25 20:46:44 +01:00 |
|
tobiasKaminsky
|
f98665bc2d
|
bugfix
|
2014-11-24 20:15:57 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
cb37a11b44
|
Update submodule to version with updated .gitignore
|
2014-11-24 12:37:12 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
79b38463b2
|
Updated instructions to the continuous presence of the *.iml files
|
2014-11-24 12:17:01 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
65aeb8728b
|
Update .gitignore and re-add missing files
|
2014-11-24 11:57:01 +01:00 |
|
Jenkins for ownCloud
|
137105a38a
|
[tx-robot] updated from transifex
|
2014-11-24 01:13:31 -05:00 |
|
Jenkins for ownCloud
|
2d66aa1dd7
|
[tx-robot] updated from transifex
|
2014-11-22 01:13:44 -05:00 |
|
tobiasKaminsky
|
df1ab9cfaa
|
- removed Log
|
2014-11-21 18:12:48 +01:00 |
|
tobiasKaminsky
|
e9ba0ebbfa
|
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
|
2014-11-21 17:58:32 +01:00 |
|
tobiasKaminsky
|
5d49850c25
|
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
|
2014-11-21 17:54:47 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
3ac5d01164
|
Update submodule with the rebased version
|
2014-11-21 16:16:37 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
c63f7fbfaf
|
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
|
2014-11-21 15:31:14 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
057cfc2e07
|
Update submodule
|
2014-11-21 15:31:04 +01:00 |
|
David A. Velasco
|
e901b609ba
|
Merge pull request #740 from owncloud/revert-669-master
Revert "Add "select all" option to photo (or other) upload screen"
|
2014-11-21 12:23:27 +01:00 |
|
jabarros
|
85d5035cbd
|
Merge pull request #722 from ogasser/idn_share_fix
Convert IDN from ASCII to Unicode in Upload Dialog
|
2014-11-21 10:56:08 +01:00 |
|
Jenkins for ownCloud
|
ddfe992cbf
|
[tx-robot] updated from transifex
|
2014-11-20 01:13:29 -05:00 |
|
David A. Velasco
|
a98f14ecc3
|
Merge pull request #721 from owncloud/nea_upload_files
Fix upload of files from DocumentsProvider in Android > 4.4
|
2014-11-19 11:26:27 +01:00 |
|
David A. Velasco
|
d737103a77
|
Merge branch 'develop' into nea_upload_files
|
2014-11-19 11:11:15 +01:00 |
|
David A. Velasco
|
703366c459
|
Fix failed uploads when display name of file brough from external apps includes separator or path-separator characters
|
2014-11-19 11:05:32 +01:00 |
|
David A. Velasco
|
3aed2954f3
|
Merge pull request #736 from owncloud/fix_refresh_account_lollipop
Fix 'refresh account' action in Lollipop
|
2014-11-19 10:50:36 +01:00 |
|
Raquel
|
4e72aac677
|
Merge branch 'develop' into fix_refresh_account_lollipop
|
2014-11-19 09:31:19 +01:00 |
|
Jenkins for ownCloud
|
bb8a10f735
|
[tx-robot] updated from transifex
|
2014-11-19 01:13:30 -05:00 |
|
jabarros
|
387374bed2
|
Fix errors in Frechn translations and reaname var in FileDisplayActivity
|
2014-11-18 10:35:52 +01:00 |
|
jabarros
|
3137438cd5
|
Merge branch 'develop' into nea_upload_files
|
2014-11-18 10:22:04 +01:00 |
|
Jenkins for ownCloud
|
d3bfbb8568
|
[tx-robot] updated from transifex
|
2014-11-18 01:13:34 -05:00 |
|
jabarros
|
bd6f9b384b
|
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support
Update reference to library after upgrading TLS support
|
2014-11-17 15:26:08 +01:00 |
|
David A. Velasco
|
4d04e70d12
|
Update reference to library after upgrading TLS support
|
2014-11-17 15:18:38 +01:00 |
|
jabarros
|
6224f73544
|
Fix crash in Android Lollipop when cliking on refresh the whole account
|
2014-11-17 14:07:48 +01:00 |
|
Luke Owncloud
|
4817e43c13
|
small changes for building on Linux
Conflicts:
SETUP.md
setup_env.sh
|
2014-11-17 13:52:56 +01:00 |
|
jabarros
|
05cb87c172
|
Update library reference
|
2014-11-17 13:51:04 +01:00 |
|
jabarros
|
a7c4814e28
|
Merge branch 'develop' into nea_upload_files
|
2014-11-17 13:49:17 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
9bfacf23cb
|
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
|
2014-11-17 13:36:26 +01:00 |
|
jabarros
|
297cb6b5c3
|
Refactoring to avoid maintenance after CR
|
2014-11-17 11:32:46 +01:00 |
|
Jenkins for ownCloud
|
3f5b3f0d1d
|
[tx-robot] updated from transifex
|
2014-11-17 01:13:35 -05:00 |
|
Jenkins for ownCloud
|
1dbd577166
|
[tx-robot] updated from transifex
|
2014-11-15 01:13:35 -05:00 |
|