tobiasKaminsky [Wed, 2 Dec 2015 19:28:56 +0000 (20:28 +0100)]
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
tobiasKaminsky [Wed, 2 Dec 2015 19:25:40 +0000 (20:25 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
tobiasKaminsky [Wed, 2 Dec 2015 19:25:13 +0000 (20:25 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Wed, 2 Dec 2015 18:55:41 +0000 (19:55 +0100)]
changed according to latest comments
Jenkins for ownCloud [Wed, 2 Dec 2015 06:13:53 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Tue, 1 Dec 2015 20:59:12 +0000 (21:59 +0100)]
changed according to latest discussion
masensio [Tue, 1 Dec 2015 15:08:01 +0000 (16:08 +0100)]
Fix issue 1319: Error on the preview, Android 4.1.2
David A. Velasco [Thu, 19 Nov 2015 08:32:34 +0000 (09:32 +0100)]
Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread
Jenkins for ownCloud [Tue, 1 Dec 2015 06:13:42 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 30 Nov 2015 20:48:06 +0000 (21:48 +0100)]
Merge branch 'beta' of github.com:owncloud/android into beta
tobiasKaminsky [Mon, 30 Nov 2015 20:44:33 +0000 (21:44 +0100)]
update to get version names in fdroid
Andy Scherzinger [Mon, 30 Nov 2015 13:24:08 +0000 (14:24 +0100)]
Merge branch 'avoidDuplicateFiles' of https://github.com/owncloud/android into beta
Andy Scherzinger [Mon, 30 Nov 2015 13:22:52 +0000 (14:22 +0100)]
BugFix for #1312 - setting ListPreference selection on pre kitkat
Jenkins for ownCloud [Mon, 30 Nov 2015 06:13:52 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Sun, 29 Nov 2015 19:26:18 +0000 (20:26 +0100)]
update
tobiasKaminsky [Sun, 29 Nov 2015 19:21:40 +0000 (20:21 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Sun, 29 Nov 2015 19:12:20 +0000 (20:12 +0100)]
Merge branch 'beta' of github.com:owncloud/android into beta
tobiasKaminsky [Sun, 29 Nov 2015 19:10:51 +0000 (20:10 +0100)]
change versionName for fdroid
tobiasKaminsky [Sun, 29 Nov 2015 13:39:21 +0000 (14:39 +0100)]
merge resiceCache
try to fix 1315
tobiasKaminsky [Sun, 29 Nov 2015 13:37:17 +0000 (14:37 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
Jenkins for ownCloud [Sun, 29 Nov 2015 06:13:42 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Andy Scherzinger [Sat, 28 Nov 2015 10:59:48 +0000 (11:59 +0100)]
fixed the version no of the FAB lib
Andy Scherzinger [Sat, 28 Nov 2015 10:51:37 +0000 (11:51 +0100)]
added PR 1220
Andy Scherzinger [Sat, 28 Nov 2015 10:48:57 +0000 (11:48 +0100)]
Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta
Conflicts:
build.gradle
Andy Scherzinger [Sat, 28 Nov 2015 10:26:58 +0000 (11:26 +0100)]
marshmallow changes redone
tobiasKaminsky [Sat, 28 Nov 2015 08:58:48 +0000 (09:58 +0100)]
update
tobiasKaminsky [Sat, 28 Nov 2015 08:52:48 +0000 (09:52 +0100)]
update
tobiasKaminsky [Sat, 28 Nov 2015 08:49:09 +0000 (09:49 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
Jenkins for ownCloud [Sat, 28 Nov 2015 06:13:42 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Andy Scherzinger [Fri, 27 Nov 2015 20:40:01 +0000 (21:40 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow
tobiasKaminsky [Fri, 27 Nov 2015 17:03:46 +0000 (18:03 +0100)]
wip
tobiasKaminsky [Fri, 27 Nov 2015 16:49:53 +0000 (17:49 +0100)]
Merge remote-tracking branch 'remotes/upstream/removeRadiosInMigration' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:49:28 +0000 (17:49 +0100)]
Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:48:54 +0000 (17:48 +0100)]
Merge remote-tracking branch 'remotes/upstream/bug_1300' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:48:20 +0000 (17:48 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:47:46 +0000 (17:47 +0100)]
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:47:08 +0000 (17:47 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:37:34 +0000 (17:37 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Fri, 27 Nov 2015 16:11:13 +0000 (17:11 +0100)]
fix 1313
Jenkins for ownCloud [Fri, 27 Nov 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 26 Nov 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Wed, 25 Nov 2015 17:50:27 +0000 (18:50 +0100)]
update
tobiasKaminsky [Wed, 25 Nov 2015 17:48:44 +0000 (18:48 +0100)]
update build process
David A. Velasco [Wed, 25 Nov 2015 08:36:48 +0000 (09:36 +0100)]
Merge pull request #1307 from owncloud/share_with_password_and_expiration_time
Share via link with password and expiration time
David A. Velasco [Tue, 24 Nov 2015 17:27:03 +0000 (18:27 +0100)]
Grant that ShareActivity is correctly refreshed if public share was removed in the server
Updated library reference after merge in master
David A. Velasco [Tue, 24 Nov 2015 16:15:20 +0000 (17:15 +0100)]
Retry forbidden share adding a password only if the value of 'enforce password' option is unknown
masensio [Thu, 19 Nov 2015 17:12:36 +0000 (18:12 +0100)]
Update library reference
David A. Velasco [Sat, 21 Nov 2015 19:18:56 +0000 (20:18 +0100)]
Fixed bug: grant that paused FileActivity behind ShareActivity is not registered as a listener with OperationService when the devide is rotated, preventing CRASH when password is enforced in server
David A. Velasco [Fri, 20 Nov 2015 15:31:17 +0000 (16:31 +0100)]
Updated handling of enforced password for public shares depending on server capabilities
David A. Velasco [Mon, 16 Nov 2015 14:13:45 +0000 (15:13 +0100)]
Hide UI elements about public share when this is disabled in the server
David A. Velasco [Mon, 16 Nov 2015 09:58:08 +0000 (10:58 +0100)]
Removed useless code
masensio [Mon, 16 Nov 2015 09:55:25 +0000 (10:55 +0100)]
Review padding values for expiration date and password rows in share view
masensio [Mon, 16 Nov 2015 09:55:04 +0000 (10:55 +0100)]
List view is shown completelly on the ShareFileFragment
masensio [Thu, 12 Nov 2015 17:02:47 +0000 (18:02 +0100)]
Delete any rest of old public share/unshare flow
masensio [Thu, 12 Nov 2015 09:50:39 +0000 (10:50 +0100)]
Implement 'Get link' button
David A. Velasco [Fri, 13 Nov 2015 10:36:15 +0000 (11:36 +0100)]
Show current expiration date selected in date picker while modifying it
David A. Velasco [Thu, 12 Nov 2015 17:55:20 +0000 (18:55 +0100)]
Modify current expiration date on touch in expiration label or value
David A. Velasco [Thu, 12 Nov 2015 16:55:20 +0000 (17:55 +0100)]
Modify current password on touch in password label or value
David A. Velasco [Thu, 12 Nov 2015 15:38:58 +0000 (16:38 +0100)]
Set or clear expiration date to protect public link in ShareFileFragment
David A. Velasco [Thu, 5 Nov 2015 12:12:38 +0000 (13:12 +0100)]
Set or clear password to protect public link in ShareFileFragment
David A. Velasco [Tue, 3 Nov 2015 16:07:34 +0000 (17:07 +0100)]
Unshare public link in ShareFileFragment
David A. Velasco [Tue, 3 Nov 2015 15:55:34 +0000 (16:55 +0100)]
Share public link in ShareFileFragment
David A. Velasco [Tue, 3 Nov 2015 12:08:43 +0000 (13:08 +0100)]
Updated ShareFileFragment layout with extra section for public shares
David A. Velasco [Mon, 2 Nov 2015 16:20:49 +0000 (17:20 +0100)]
Removed unneeded FrameLayout
Jenkins for ownCloud [Wed, 25 Nov 2015 06:13:40 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Tue, 24 Nov 2015 21:08:10 +0000 (22:08 +0100)]
test for fdroid
tobiasKaminsky [Tue, 24 Nov 2015 20:28:31 +0000 (21:28 +0100)]
update apk
Jenkins for ownCloud [Tue, 24 Nov 2015 06:13:40 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 23 Nov 2015 21:03:41 +0000 (22:03 +0100)]
test tag for fdroid
Jenkins for ownCloud [Mon, 23 Nov 2015 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Andy Scherzinger [Sun, 22 Nov 2015 16:10:37 +0000 (17:10 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
tobiasKaminsky [Sun, 22 Nov 2015 12:22:59 +0000 (13:22 +0100)]
rename file is not working across mount points: therefore copying it and then delete
tobiasKaminsky [Sun, 22 Nov 2015 11:19:17 +0000 (12:19 +0100)]
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
tobiasKaminsky [Sun, 22 Nov 2015 11:18:26 +0000 (12:18 +0100)]
fix NEP
Bartosz Przybylski [Sun, 22 Nov 2015 11:17:58 +0000 (12:17 +0100)]
Remove radios for copy or move in while searching for target dir in migration wizard
tobiasKaminsky [Sun, 22 Nov 2015 11:05:09 +0000 (12:05 +0100)]
add missing result check
Bartosz Przybylski [Sun, 22 Nov 2015 10:42:52 +0000 (11:42 +0100)]
Correctly handle empty directory case when browsing local files
Bartosz Przybylski [Sun, 22 Nov 2015 10:20:24 +0000 (11:20 +0100)]
For more reliability delete old files recursively in migration cleanup
tobiasKaminsky [Sun, 22 Nov 2015 09:13:40 +0000 (10:13 +0100)]
fix wrong cast of cache size
tobiasKaminsky [Sun, 22 Nov 2015 08:16:25 +0000 (09:16 +0100)]
update lib
Jenkins for ownCloud [Sun, 22 Nov 2015 06:13:39 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 21 Nov 2015 09:03:07 +0000 (10:03 +0100)]
Merge remote-tracking branch 'remotes/upstream/setAsWallpaper' into beta
tobiasKaminsky [Sat, 21 Nov 2015 08:54:18 +0000 (09:54 +0100)]
update apk
tobiasKaminsky [Sat, 21 Nov 2015 08:50:57 +0000 (09:50 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
tobiasKaminsky [Sat, 21 Nov 2015 08:40:30 +0000 (09:40 +0100)]
update pr
tobiasKaminsky [Sat, 21 Nov 2015 08:36:06 +0000 (09:36 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Sat, 21 Nov 2015 08:35:19 +0000 (09:35 +0100)]
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
tobiasKaminsky [Sat, 21 Nov 2015 08:33:26 +0000 (09:33 +0100)]
Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
tobiasKaminsky [Sat, 21 Nov 2015 08:26:53 +0000 (09:26 +0100)]
fixed bug #1297
tobiasKaminsky [Sat, 21 Nov 2015 08:03:53 +0000 (09:03 +0100)]
changes according to CR (code review)
tobiasKaminsky [Sat, 21 Nov 2015 07:48:40 +0000 (08:48 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
Jenkins for ownCloud [Sat, 21 Nov 2015 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 20 Nov 2015 17:57:36 +0000 (18:57 +0100)]
update apk
tobiasKaminsky [Fri, 20 Nov 2015 17:51:37 +0000 (18:51 +0100)]
Merge remote-tracking branch 'remotes/upstream/bug_1251' into beta
tobiasKaminsky [Fri, 20 Nov 2015 17:36:50 +0000 (18:36 +0100)]
Merge remote-tracking branch 'remotes/upstream/1193_uploader_layout' into beta
tobiasKaminsky [Fri, 20 Nov 2015 17:32:55 +0000 (18:32 +0100)]
Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
Maria Asensio [Fri, 20 Nov 2015 11:24:11 +0000 (12:24 +0100)]
Merge pull request #1119 from owncloud/strip-index-php-from-server-url
Strip away index.php/apps/files to allow copy pasting from the server
Jenkins for ownCloud [Fri, 20 Nov 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Bartosz Przybylski [Wed, 11 Nov 2015 22:01:39 +0000 (23:01 +0100)]
Don't allow to remove passcode without entering it. Don't allow to set incomplete passcode,
tobiasKaminsky [Thu, 19 Nov 2015 19:30:02 +0000 (20:30 +0100)]
extract string ressource
projects / pub / Android / ownCloud.git / log