David A. Velasco
|
09a56d3c60
|
Update reference to library
|
2014-11-24 14:15:38 +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 |
|
tobiasKaminsky
|
21a505cc33
|
changed order to: file(s), folder(s)
|
2014-11-24 10:59:31 +01:00 |
|
jabarros
|
5a8ebc132c
|
Update owncloud library reference
|
2014-11-24 10:54:13 +01:00 |
|
Jenkins for ownCloud
|
137105a38a
|
[tx-robot] updated from transifex
|
2014-11-24 01:13:31 -05:00 |
|
tobiasKaminsky
|
8364865ca6
|
restore file
|
2014-11-23 13:37:10 +01:00 |
|
tobiasKaminsky
|
d05d7361ff
|
- thumbnails on browsing local files during upload
|
2014-11-23 13:34:24 +01: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
|
580c1f008e
|
fix bug #742
|
2014-11-21 18:08:44 +01:00 |
|
tobiasKaminsky
|
ae6b686775
|
Merge remote-tracking branch 'upstream/develop' into fileCount
|
2014-11-21 17:59:51 +01:00 |
|
tobiasKaminsky
|
e9ba0ebbfa
|
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
|
2014-11-21 17:58:32 +01:00 |
|
tobiasKaminsky
|
b2158a8673
|
Merge branch 'develop' of git@github.com:owncloud/android.git into
developNew
Conflicts:
res/values-fr/strings.xml
|
2014-11-21 17:58:01 +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 |
|
Jos Poortvliet
|
96a256aec7
|
Update README.md
Linking not to raw MD file but to the nicely formatted one in github :D
|
2014-11-21 14:52:15 +01:00 |
|
David A. Velasco
|
ca1c8b1f5e
|
Merge branch 'develop' into release-1.6.2
|
2014-11-21 12:40:05 +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
|
803ed34874
|
Merge branch 'develop' into release-1.6.2
|
2014-11-21 10:57:38 +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 |
|
jabarros
|
094fa09e9e
|
Update version number and name in oc_jb_workaround subproject
|
2014-11-20 18:03:33 +01:00 |
|
jabarros
|
8d505deed1
|
Update version number and name
|
2014-11-20 18:01:05 +01:00 |
|
Luke Owncloud
|
8de07698d9
|
integrating @davivels remarks
|
2014-11-20 13:46:54 +01:00 |
|
jabarros
|
aa16b13ab9
|
Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder
|
2014-11-20 09:39:10 +01:00 |
|
Jenkins for ownCloud
|
ddfe992cbf
|
[tx-robot] updated from transifex
|
2014-11-20 01:13:29 -05:00 |
|
jabarros
|
1435e8c406
|
Merge branch 'develop' into instant_uploads_set_path
|
2014-11-19 18:40:06 +01: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 |
|
jabarros
|
a2de2f28ab
|
Add new preference on settings for setting the upload video path
|
2014-11-19 10:14:27 +01:00 |
|
Raquel
|
4e72aac677
|
Merge branch 'develop' into fix_refresh_account_lollipop
|
2014-11-19 09:31:19 +01:00 |
|
jabarros
|
cab3c5298c
|
Remove 'sort' and 'logs' options from action bar menu when showing the selecting upload path folder view
|
2014-11-19 09:22:12 +01:00 |
|
tobiasKaminsky
|
f273fe03fa
|
linewrap
|
2014-11-19 09:19:04 +01:00 |
|
tobiasKaminsky
|
bdd46fd811
|
cleanup
|
2014-11-19 09:11:44 +01:00 |
|
Jenkins for ownCloud
|
bb8a10f735
|
[tx-robot] updated from transifex
|
2014-11-19 01:13:30 -05:00 |
|
tobiasKaminsky
|
4867bb32c3
|
Merge remote-tracking branch 'upstream/develop' into imageGrid
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
|
2014-11-18 18:08:28 +01:00 |
|
tobiasKaminsky
|
462d032625
|
Temporary fix of missing escape for apostrophe
|
2014-11-18 17:30:27 +01:00 |
|
Marc Plano-Lesay
|
a9e04965a6
|
Restore the current image when the preview activity is hidden
fixes #728
|
2014-11-18 15:57:04 +01:00 |
|
jabarros
|
c2ec3f783d
|
When user goes to set the upload path, the folder list view is shown in the current path set
|
2014-11-18 15:09:39 +01:00 |
|
jabarros
|
87b242019c
|
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
|
2014-11-18 14:57:19 +01:00 |
|
jabarros
|
dc8a495e55
|
Remove files_move layout after creating files_folder_picker one
|
2014-11-18 14:53:41 +01:00 |
|
jabarros
|
00a8eb415a
|
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
|
2014-11-18 14:51:49 +01:00 |
|
jabarros
|
12b4b0397f
|
Add view for selecting upload path folder browsing through local file list in preferences view
|
2014-11-18 11:01:55 +01: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 |
|