mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
2589 commits 228 branches 1571 tags 618 MiB
Commit graph

2589 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
David A. Velasco
299ad36bb8 Thumbnails cache initialized in MainApp context to grant it is done even if the app wasn't opened, for the case of background synchronizations 2014-10-15 12:29:41 +02:00
jabarros
2910b00673 Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2014-10-15 12:20:49 +02:00
David A. Velasco
395ad3248e Creation of ThumbnailsCacheManager class, grouping all the methods needed to access the thumbnails cache 2014-10-15 11:25:29 +02:00
jabarros
f68139619b Fixed. When define as instant upload path a path that does not exist, a crash is gotten 2014-10-15 11:21:37 +02:00
jabarros
d5625e6ccc Fixed. App crash when setting a path without slash 2014-10-15 08:21:24 +02:00
jabarros
016bdfac1f Fixed. Upload path is not place correctly in setting view 2014-10-15 08:21:23 +02:00
Jenkins for ownCloud
1ffa6e969a [tx-robot] updated from transifex 2014-10-15 01:13:34 -04:00
David A. Velasco
778ed30b58 Removed unused import 2014-10-14 13:19:56 +02:00