Jorge Antonio Diaz-Benito Soriano
0c384167c1
Added some margins.
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
c9105c61d9
Added Java 1.5 restriction to match the application standards
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
1629981256
Fixed line breaks
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
3877ddf85a
Minor updates
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
65e82bff36
Removed any remains of list appearance
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
fac3332900
Fixed a mistake.
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
ec9f1c7eb8
Reworked the text file preview system to avoid UI freezes with large text files
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
7cc88a22d1
Added text file preview
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
b22dc8bce6
Minor updates
2014-10-28 18:43:10 +01:00
Jorge Antonio Diaz-Benito Soriano
c95722a9b3
Fix Linux setup script
2014-10-28 16:47:28 +01:00
Jorge Antonio Diaz-Benito Soriano
d7d4726929
Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency
...
Conflicts:
setup_env.sh
2014-10-28 16:13:10 +01:00
MMMarcy
9fbeb05ad9
Readded git link that was erraneously removed by the rebase
2014-10-28 16:09:34 +01:00
MMMarcy
2cad715525
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-28 16:09:34 +01:00
David A. Velasco
fe299fc8a1
Merge pull request #673 from owncloud/idn_hosts
...
Suuport for URLs to ownCloud servers running on IDN
2014-10-28 14:35:06 +01:00
jabarros
d9604bf99e
Merge branch 'develop' into idn_hosts
2014-10-28 13:27:32 +01:00
Jenkins for ownCloud
5acc314524
[tx-robot] updated from transifex
2014-10-28 01:13:38 -04:00
Jenkins for ownCloud
495c812671
[tx-robot] updated from transifex
2014-10-27 01:13:33 -04:00
Jenkins for ownCloud
3507ff8003
[tx-robot] updated from transifex
2014-10-26 01:13:34 -04:00
Jenkins for ownCloud
27bcd4de0a
[tx-robot] updated from transifex
2014-10-25 01:13:41 -04: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
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
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
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
524a6e2bdd
- added lgpgl
2014-10-18 10:47:36 +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
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
