Commit graph

4874 commits

Author SHA1 Message Date
Andy Scherzinger
413707272a rebased to master: resolved conflicts (edits from fab implementation) 2016-02-25 19:38:24 +01:00
Andy Scherzinger
5d23792441 support lib ant folder from master 2016-02-25 19:03:56 +01:00
Bartosz Przybylski
b6b830e722 Revert incorrect merge decision 2016-02-25 18:24:56 +01:00
Andy Scherzinger
41a9db61c4 Revert "target_marshmallow branch push"
This reverts commit 7bec1569f7.
2016-02-25 18:24:23 +01:00
Andy Scherzinger
02c584dcf3 new 23.1.0 files 2016-02-25 18:22:36 +01:00
Andy Scherzinger
7a782f1a68 added missing empty src folder for ant build 2016-02-25 18:22:30 +01:00
Andy Scherzinger
4917b43d68 upgrade to 23.1.0 AppCompat and bumping Compile Target to 23 (Android M, needed in order to use AppCompat 23+) 2016-02-25 18:22:29 +01:00
Andy Scherzinger
1d332cc013 removed old FAB lib version 2016-02-25 18:20:47 +01:00
Andy Scherzinger
68e9b89464 add jar to libs folder for ant to find... 2016-02-25 18:16:34 +01:00
Andy Scherzinger
d7f0ba9d94 trying to add a .classpath file 2016-02-25 18:16:33 +01:00
Andy Scherzinger
6161d21301 added dummy src folder for ant build 2016-02-25 18:15:32 +01:00
Andy Scherzinger
c222cc35dd changed project to library 2016-02-25 18:15:24 +01:00
Andy Scherzinger
2bbc427b8e experimental add of fab lib to check if travis build is still working 2016-02-25 18:15:24 +01:00
Andy Scherzinger
8bf7c22ad7 fix for scrolling beyond the fab see #1346 2016-02-25 18:15:01 +01:00
Andy Scherzinger
c88c0fdee0 fixed the version no of the FAB lib 2016-02-25 18:15:01 +01:00
Andy Scherzinger
5e9bf598f3 force all menu items into the overflow menu (see discussion https://github.com/owncloud/android/issues/1232#issuecomment-153075076) 2016-02-25 18:15:00 +01:00
Andy Scherzinger
69d420bc2d Revert "target_marshmallow branch push"
This reverts commit 7bec1569f7.
2016-02-25 18:15:00 +01:00
Andy Scherzinger
f7d943822f new 23.1.0 files 2016-02-25 18:12:42 +01:00
Andy Scherzinger
fb02257789 added missing empty src folder for ant build 2016-02-25 18:12:28 +01:00
Andy Scherzinger
816e5d7fd7 upgrade to 23.1.0 AppCompat and bumping Compile Target to 23 (Android M, needed in order to use AppCompat 23+) 2016-02-25 18:12:28 +01:00
Andy Scherzinger
be34f62118 removed old FAB lib version 2016-02-25 18:07:58 +01:00
Andy Scherzinger
ff994f8b1a updating FAB lib to 1.10.1 2016-02-25 18:07:58 +01:00
Andy Scherzinger
d4ce0d920f hide FAB in copy/move folder chooser 2016-02-25 18:07:49 +01:00
Andy Scherzinger
8d23bdcf9f added accents color definition on missed out top level theme definitions. 2016-02-25 18:07:42 +01:00
Andy Scherzinger
3d7985b084 minor refresh button fixes 2016-02-25 18:07:42 +01:00
Andy Scherzinger
be421ce04d don't show labels all the time just during the first usage and application lifecycle. When the app is restarted the labels then won't show again. 2016-02-25 18:07:42 +01:00
Andy Scherzinger
4ecf325ea6 close logic on back pressed for drawer/fab/up-navigation 2016-02-25 18:07:29 +01:00
Andy Scherzinger
d7ff626db3 added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions 2016-02-25 18:07:29 +01:00
Andy Scherzinger
e8c64ebf8d initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi 2016-02-25 18:07:28 +01:00
Andy Scherzinger
b1dd299cdb coloer changes for #1132 2016-02-25 18:07:11 +01:00
Andy Scherzinger
4c9fd72c3e add jar to libs folder for ant to find... 2016-02-25 18:07:11 +01:00
Andy Scherzinger
78e4ff512e trying to add a .classpath file 2016-02-25 18:07:11 +01:00
Andy Scherzinger
e0bacfaaea initial implementation of the FAB with Speed Dial 2016-02-25 18:07:11 +01:00
Andy Scherzinger
c2422eebef added dummy src folder for ant build 2016-02-25 18:07:10 +01:00
Andy Scherzinger
713bf3f4c1 changed project to library 2016-02-25 18:07:04 +01:00
Andy Scherzinger
45fbdea220 experimental add of fab lib to check if travis build is still working 2016-02-25 18:07:04 +01:00
masensio
c0cf6d8788 Use Upload End Time in Uploads View 2016-02-25 15:32:12 +01:00
Juan Carlos González Cabrero
2682b1fd3d Upload path update after renaming 2016-02-25 12:27:18 +01:00
Maria Asensio
a3521df56e Merge pull request #1484 from AndyScherzinger/master
Added further references in CONTRIBUTING.md documentation
2016-02-24 11:01:34 +01:00
David A. Velasco
fcf107005f Merge pull request #1486 from owncloud/reliable_uploads_actions_uploads_view__credentials_error
Fix problems with Credentials error in uploads
2016-02-24 10:46:37 +01:00
Juan Carlos González Cabrero
a506014d58 Checking of local file when an upload retry is requested 2016-02-24 10:41:50 +01:00
masensio
531615c077 Changes from code review comments 2016-02-24 10:37:50 +01:00
masensio
ae5605e55b Fix problems with Credentials error in uploads 2016-02-24 10:37:13 +01:00
David A. Velasco
d2940f6214 Used OC trashbin icon in uploads view 2016-02-24 10:11:54 +01:00
Jenkins for ownCloud
674095a911 [tx-robot] updated from transifex 2016-02-24 01:13:33 -05:00
David A. Velasco
0ec9543671 Remove progress bubble in uploads list as soon as pull-2-refresh is triggered 2016-02-23 17:57:53 +01:00
David A. Velasco
de1f34c493 Delay instant uploads when WiFi requirement is not met, and show as failed uploads in uploads list 2016-02-23 17:01:51 +01:00
David A. Velasco
5eeca847d1 Remove uploads from persisted list when cancelled 2016-02-23 13:56:23 +01:00
Juan Carlos González Cabrero
d49379abf8 Refactorized UploadStatus to have only 3 types of Status 2016-02-23 12:56:07 +01:00
Juan Carlos González Cabrero
a3aaca9ca3 Fixed the crash uploading without connection 2016-02-23 11:33:42 +01:00