mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity
2681 commits 225 branches 1574 tags 621 MiB
Commit graph

2681 commits

This branch
This branch
All branches
Author SHA1 Message Date
David A. Velasco
a09a837585 Adjust the thumbnails size to the size used on screen 2014-11-03 11:27:51 +01:00
jabarros
e53c6001dd Merge branch 'develop' into christmas_app 2014-11-03 10:41:49 +01:00
jabarros
9f1dd62c90 Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients 2014-11-03 10:37:56 +01:00
Jenkins for ownCloud
8de92ba3b0 [tx-robot] updated from transifex 2014-11-01 01:13:35 -04:00
David A. Velasco
0bedcb9128 Merge branch 'remember_last_share_location' into remember_last_share_location_fixed 2014-10-31 15:23:59 +01:00
David A. Velasco
87aa0fcfb7 Enable 'up' navigation from home button 2014-10-31 15:20:48 +01:00
David A. Velasco
dbd981f012 Fixed crash and remembered location when there are multiple accounts 2014-10-31 15:08:08 +01:00
David A. Velasco
9709593ccf Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar() 2014-10-31 15:06:45 +01:00
jabarros
f345e3fed2 Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server 2014-10-31 13:52:26 +01:00
jabarros
639d122721 Fixed. When an image is updated in the server and app folder is refreshed, the thumbnail does not change and it is not updated 2014-10-31 13:30:26 +01:00
Jenkins for ownCloud
ca0eac841a [tx-robot] updated from transifex 2014-10-31 01:13:34 -04:00
jabarros
0a39462210 Merge pull request #697 from owncloud/fix_https_access_via_proxy 
Update reference to library with bugfix
 2014-10-30 14:33:58 +01:00
David A. Velasco
c71b0de051 Update reference to library with bugfix 2014-10-30 14:26:58 +01:00
tobiasKaminsky
595a63bc39 Bugfix 2014-10-30 08:20:55 +01:00
grecep
31ffae0093 Revert "Add "select all" option to photo (or other) upload screen" 2014-10-29 22:37:45 +01:00
grecep
fd7a940dee Merge pull request #669 from grecep/master 
Add "select all" option to photo (or other) upload screen
 2014-10-29 22:29:38 +01:00
jabarros
945c584f34 Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect 
Bugfix multiple select
 2014-10-29 18:09:16 +01:00
Jenkins for ownCloud
068b826b32 [tx-robot] updated from transifex 2014-10-29 01:13:41 -04:00
grecep
8d29b6318c removed unnecessary code 2014-10-28 20:50:09 +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
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
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
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