tobiasKaminsky
3c53502efa
rebase
2014-10-24 18:45:09 +02:00
tobiasKaminsky
ec19a11a38
Merge remote-tracking branch 'upstream/develop' into
...
bugfixMultipleSelect
Conflicts:
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
2014-10-24 18:44:04 +02:00
David A. Velasco
8d3a956c97
Merge branch 'master' into develop
2014-10-24 15:24:50 +02:00
jabarros
552a84c1c7
Merge pull request #675 from owncloud/hotfix_full_sync_ignoring_etag
...
HOTFIX - Full-account synchronization should never fetch the contents of a folder...
2014-10-24 14:38:30 +02:00
jabarros
2e47071c9c
Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android into thumbnails_from_server
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-10-24 13:38:03 +02:00
David A. Velasco
01f1f62d2c
Merge pull request #676 from owncloud/sorting_files
...
Added sorting by name or date
2014-10-24 13:24:35 +02:00
David A. Velasco
83ab65da1f
Bump workaround app version to 1.0.19
2014-10-24 10:52:41 +02:00
David A. Velasco
2d6e7e3aaf
Bump app version to 1.6.1
2014-10-24 10:51:40 +02:00
David A. Velasco
ee6f2e7217
Full-account synchronization should never fetch the contents of a folder
...
if its eTag did not change
2014-10-24 10:13:43 +02:00
Jenkins for ownCloud
8a77b0be15
[tx-robot] updated from transifex
2014-10-24 01:13:37 -04:00
jabarros
c8d2d46627
Fixed. When trying to open the app in Galaxy mini 2, a crash appears
2014-10-23 18:06:59 +02:00
jabarros
3bd60c2b0f
Fixed. In devices with Android 2.x 'Sort' option in menu has not icon related
2014-10-23 18:05:28 +02:00
jabarros
69320c8805
Merge branch 'develop' into idn_hosts
2014-10-23 11:20:09 +02:00
jabarros
583194a19a
Add comment removed when fixing conflict in merge
2014-10-23 11:16:31 +02:00
jabarros
6970560d2f
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2
...
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-10-23 11:06:05 +02:00
jabarros
2fad1e1a99
Merge branch 'develop' into sorting_files_2
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-10-23 10:18:20 +02:00
Jenkins for ownCloud
832a98f47c
[tx-robot] updated from transifex
2014-10-23 01:13:40 -04:00
Jenkins for ownCloud
2e6410e771
[tx-robot] updated from transifex
2014-10-22 01:14:52 -04:00
Magnus Sjoqvist
52bf54a00d
Removes remember last share location setting
2014-10-21 17:27:47 +02:00
Magnus Sjoqvist
2b1865d1d0
Removes translations
2014-10-21 16:17:00 +02:00
David A. Velasco
25a36a4fe7
Merge pull request #653 from LukeOwncloud/develop
...
Small improvements in build instructions for Linux
2014-10-21 13:22:08 +02:00
Jenkins for ownCloud
7dc7e85df8
[tx-robot] updated from transifex
2014-10-21 01:15:22 -04:00
tobiasKaminsky
bc4a7bfe43
- added requested changes
2014-10-20 19:52:12 +02:00
jabarros
3a8ff76d0a
Merge branch 'master' into develop
...
Conflicts:
owncloud-android-library
2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
dedd5bb36b
Fixed log import
2014-10-20 14:48:06 +02:00
Magnus Sjoqvist
844790057b
Merge with develop
2014-10-20 14:38:13 +02:00
David A. Velasco
6ed394195d
Merge pull request #658 from owncloud/instant_upload_path_chooseable
...
Instant upload path chooseable
2014-10-20 13:56:18 +02:00
David A. Velasco
274edb45ed
Build with new Android support in Travis
2014-10-20 13:48:12 +02:00
jabarros
a2c91af7f5
Update library reference to 0.9.3 version
2014-10-20 13:32:01 +02:00
jabarros
8f9d00be1c
Update owncloud android library reference
2014-10-20 12:59:41 +02:00
Jenkins for ownCloud
8be4bb14a3
[tx-robot] updated from transifex
2014-10-20 01:14:34 -04:00
tobiasKaminsky
712a513532
- bugfix
2014-10-19 19:36:04 +02:00
tobiasKaminsky
697719ce0e
- fix bug
2014-10-19 19:33:31 +02:00
tobiasKaminsky
524a6e2bdd
- added lgpgl
2014-10-18 10:47:36 +02:00
tobiasKaminsky
effa6908b0
- Using Uri.encode...
...
- Thumbnail size is set to 32dp
2014-10-17 21:54:01 +02:00
tobiasKaminsky
bc3f8b3354
- requested changes by review by davivel
2014-10-17 21:28:48 +02:00
MMMarcy
e4058fa2c5
Readded git link that was erraneously removed by the rebase
2014-10-17 15:36:48 +02:00
MMMarcy
d8d75623e4
Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
...
Conflicts:
owncloud-android-library
pom.xml
2014-10-17 14:58:27 +02:00
MMMarcy
0775b10a04
Commit for the PR
...
The pull request targets:
1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module
Remainders:
1) Change the sub-module back to the owncloud android library
once the PR will be merge
2014-10-17 14:42:11 +02:00
Magnus Sjoqvist
b6c7719415
Merge with develop
2014-10-17 11:06:30 +02:00
Magnus Sjoqvist
89627024b1
Added check for that the last upload folder still exists
2014-10-17 10:35:57 +02:00
Jenkins for ownCloud
95a02855ee
[tx-robot] updated from transifex
2014-10-17 01:13:52 -04:00
David A. Velasco
e3e5c205b6
Fix thumbnail generation after successful upload
2014-10-16 16:14:03 +02:00
David A. Velasco
d7de54a6a5
Fix glitch in reuse of thumbnails after crossed rename of files in the server side
2014-10-16 16:13:17 +02:00
jabarros
8859ba3971
Fixed. File is not downloaded in the end, when adding a slash at the end of the path
2014-10-16 14:13:09 +02:00
David A. Velasco
fe2f7ce8a6
Fix lost update of remoteId when file is sync'ed after being replaced in server by other one
2014-10-16 13:11:32 +02:00
jabarros
ad291624a3
Fixed. App crashes when changing the path and not going to the file list. Rename some methods.
2014-10-16 09:49:00 +02:00
Jenkins for ownCloud
475dff85c6
[tx-robot] updated from transifex
2014-10-16 01:14:37 -04:00
jabarros
e4c77cabcb
Fixed. The thumbnail of the just uploaded image is refreshed when it is not necessary
2014-10-15 18:36:39 +02:00
David A. Velasco
5fd7b7e29f
Build with new Android support in Travis
2014-10-15 16:40:44 +02:00