mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
2827 commits 227 branches 1571 tags 618 MiB
Commit graph

2827 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasKaminsky
f46dd624f7 - added Comment 2014-10-28 14:27:03 +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
jabarros
dcb985481b Merge branch 'develop' into thumbnails_from_server 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-27 15:12:48 +01:00
jabarros
13fab9321e Add check of server version before requesting remote thumbnails 2014-10-27 12:36:11 +01:00
Jenkins for ownCloud
495c812671 [tx-robot] updated from transifex 2014-10-27 01:13:33 -04:00
tobiasKaminsky
56d9529b14 - beautify Timestamps 2014-10-26 21:12:45 +01:00
Jenkins for ownCloud
3507ff8003 [tx-robot] updated from transifex 2014-10-26 01:13:34 -04:00
tobiasKaminsky
b18fabe9d7 - bugfix: video is now playing in fullscreen 2014-10-25 18:55:15 +02:00
tobiasKaminsky
c779c7c6ed - obey exif orientation tag 2014-10-25 16:51:49 +02:00
Jenkins for ownCloud
27bcd4de0a [tx-robot] updated from transifex 2014-10-25 01:13:41 -04:00
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
tobiasKaminsky
13758253ca -rebase on develop 2014-10-24 18:34:39 +02:00
tobiasKaminsky
fbc3d970c5 Merge remote-tracking branch 'upstream/develop' into fileCount 
Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-24 18:18:06 +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
tobiasKaminsky
4bbb4846bb - clean up 2 2014-10-22 12:41:56 +02:00
tobiasKaminsky
fd12caf9ae - cleaned up 2014-10-22 12:40:17 +02:00
tobiasKaminsky
b6f773bf8c - moved MediaScan to DownloadFileOperation. 2014-10-22 11:20:08 +02:00
tobiasKaminsky
10b980cacf - fixed wrong project.properties 2014-10-22 11:02:48 +02:00
tobiasKaminsky
c505977cb8 - update to obey non-image files 2014-10-22 09:07:08 +02:00
tobiasKaminsky
d7b32ecc17 Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 
Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2014-10-22 08:09:47 +02: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