masensio
20b0ec8977
Show users/groups in share with view, getting the data from the server
2015-10-30 16:26:26 +01:00
masensio
00a221ea8f
Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project
2015-10-30 16:25:54 +01:00
David A. Velasco
0db4fc9b17
Sync user and group shares into database
2015-10-30 16:25:52 +01:00
masensio
905b68b4ec
Show the 'search' layout in phone and tablet
2015-10-30 15:23:03 +01:00
masensio
2855a81cf0
Create the layout for searching users/groups
2015-10-30 15:22:58 +01:00
masensio
f28faf0c26
Show the layout to hsare with user in phone and tablet
2015-10-30 15:21:48 +01:00
masensio
8e3d7bdc8f
Create the layout to share with a user
2015-10-30 15:10:42 +01:00
Andy Scherzinger
5c1e6e59ba
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-22 13:05:06 +02:00
Andy Scherzinger
dffd81e00c
removed primary color usage for textColor of the input fields on the loginscreen
2015-10-21 11:31:58 +02:00
Andy Scherzinger
e61641b39d
center align radio buttons
2015-10-21 11:05:11 +02:00
tobiasKaminsky
e18773465d
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles
2015-10-15 18:27:07 +02:00
Wikinaut
cf063bf04a
fix #1024 show cert fingerprints when adding new account w/ untrusted cert
...
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
instead of signature hex dump
when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
2015-10-02 02:39:10 +02:00
Andy Scherzinger
917039411c
added a divider to the bottom part
2015-09-27 20:43:18 +02:00
Andy Scherzinger
2ffdb4db00
16dp right and left for checkpoxed
2015-09-27 20:32:44 +02:00
tobiasKaminsky
57862ef52c
added 16dp padding
2015-09-25 17:30:30 +02:00
Andy Scherzinger
5417b2a4e5
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
2015-09-25 16:09:01 +02:00
David A. Velasco
c44ed4980c
Fixed lost background color for icon in login view
2015-09-25 11:11:46 +02:00
tobiasKaminsky
2b6a61ddae
#819 part3: When uploading from filesystem inside the owncloud app, show question
2015-09-21 09:45:20 +02:00
tobiasKaminsky
a64308f382
wip
2015-09-21 09:03:09 +02:00
tobiasKaminsky
a1b2655d85
wip
2015-09-21 08:57:00 +02:00
Andy Scherzinger
f6b2b856cb
Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192
2015-09-17 11:46:37 +02:00
Andy Scherzinger
044c597e2b
fix for refresh bug
2015-09-16 17:21:53 +02:00
Andy Scherzinger
94bc0699ac
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
fixed realignment item badges
Conflicts:
res/layout/list_item.xml
2015-09-16 16:27:47 +02:00
Andy Scherzinger
4c0371f82b
center aligned the folder icon with the drawer icon
2015-09-16 11:41:37 +02:00
Andy Scherzinger
13a73dd568
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-11 12:47:01 +02:00
Andy Scherzinger
e9f793755e
showing the filename in the long press menu on file list, see #559
2015-09-07 12:24:01 +02:00
Andy Scherzinger
6d670fb678
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-07 11:16:29 +02:00
Andy Scherzinger
e7674368e2
fix duplicate
2015-09-04 13:24:12 +02:00
Andy Scherzinger
7ac2a0d297
fix layout/uploader_layout.xml
2015-09-04 13:20:41 +02:00
Andy Scherzinger
32145d57db
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/uploader_layout.xml
2015-09-04 13:16:11 +02:00
masensio
3b2c61a48c
Merge branch 'master' into uploadShowsFiles
...
Conflicts:
res/layout/uploader_layout.xml
res/layout/uploader_list_item_layout.xml
src/com/owncloud/android/ui/activity/Uploader.java
2015-09-02 16:45:33 +02:00
masensio
a0707428ff
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
...
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2015-09-02 13:23:42 +02:00
masensio
b81de1d547
Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
...
Conflicts:
res/layout/uploader_layout.xml
2015-08-25 14:53:42 +02:00
tobiasKaminsky
8e3787909f
Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
2015-08-21 17:48:58 +02:00
Andy Scherzinger
fd39e9168b
replaced the icons and header coloring
2015-08-21 17:32:24 +02:00
masensio
3e6bcda9a4
Merge branch 'develop' into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2015-08-20 16:37:10 +02:00
Andy Scherzinger
7f13b98cc0
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
2015-08-18 23:20:01 +02:00
Andy Scherzinger
cbb0f8743f
Fix for long click menue for account management in preferences screen
2015-08-18 23:13:10 +02:00
Andy Scherzinger
da89715045
reverted back to light colored login
2015-08-18 17:48:10 +02:00
masensio
e5e5b3638c
Merge branch 'develop' into reliable_uploads
...
Conflicts:
SETUP.md
owncloud-android-library
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/db/DbHandler.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/ComponentsGetter.java
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-08-18 15:14:37 +02:00
Andy Scherzinger
b669bd7737
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 16:04:17 +02:00
Andy Scherzinger
ba80646e4e
Fix for 4.0 file action context menu (re-implement it via DialogFragment)
2015-08-17 15:58:03 +02:00
Andy Scherzinger
16a5bdc8d1
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 09:05:33 +02:00
Andy Scherzinger
80e7836840
set back font weight on drawer list items
2015-08-17 09:04:37 +02:00
Andy Scherzinger
267179ef2e
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-14 18:55:58 +02:00
Andy Scherzinger
71f68b4c8c
fix for progressbars on pre lollipop and post ics for seekbar thumbs
2015-08-14 18:55:31 +02:00
Andy Scherzinger
a7859b4ab4
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/drawer.xml
res/layout/drawer_list_item.xml
res/values/styles.xml
2015-08-14 17:45:22 +02:00
Andy Scherzinger
92af92ee3b
merged part of the fixes from material buttons branch to fix bugs reported in PR #1076
2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8
fixed drawer font size, changed color according to material guide
2015-08-14 16:00:35 +02:00
Andy Scherzinger
9d08a3f306
fix for drawer width
2015-08-14 15:40:22 +02:00
Andy Scherzinger
607fb6f587
group change data and size together and calculate decimals based on total size see comment in PR #1090
2015-08-14 10:05:26 +02:00
Andy Scherzinger
c86e92870f
fixed padding of list items
2015-08-14 00:34:12 +02:00
Andy Scherzinger
927ce968d7
fixed progress wheel
2015-08-13 19:43:56 +02:00
Andy Scherzinger
f17011ff68
some more styling for the log screen
2015-08-13 19:05:20 +02:00
Andy Scherzinger
5b92747895
standard material paddings set
2015-08-13 18:39:53 +02:00
Andy Scherzinger
64910f59bb
fixed checkbox (now also material design on pre lollipop)
2015-08-13 18:39:36 +02:00
Andy Scherzinger
8a8eb435a3
set standard 16dp whitespaces via config values not hardcoded
2015-08-13 18:08:21 +02:00
Andy Scherzinger
ba3bc9cbfd
minor padding change on logo
2015-08-13 17:54:58 +02:00
Andy Scherzinger
af2af7198b
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/ssl_untrusted_cert_layout.xml
res/layout/ssl_validator_layout.xml
2015-08-13 15:57:38 +02:00
Andy Scherzinger
60e0f09278
Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons
2015-08-13 15:41:59 +02:00
Andy Scherzinger
05ca0270a8
fixed button style blue/grey
2015-08-12 18:54:27 +02:00
Andy Scherzinger
5257af90bc
fixed username to be single line and ellipsized in case of lang names
2015-08-12 18:48:33 +02:00
masensio
eda6f71491
Move create folder button to action bar in Uploader
2015-08-11 11:14:26 +02:00
Andy Scherzinger
6809e4a9de
16dp spacing for the footer too
2015-08-10 18:50:24 +02:00
Andy Scherzinger
e22b547401
further 16dp spacings
2015-08-10 18:36:50 +02:00
Andy Scherzinger
c085ffd545
inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes
2015-08-10 18:32:25 +02:00
Andy Scherzinger
f4445284d0
material checkbox drawables instead of version dependend ones
2015-08-07 18:05:34 +02:00
Andy Scherzinger
4a4296a07e
Material Buttons (draft)
2015-08-07 17:09:47 +02:00
masensio
b694fee63d
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
...
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-08-05 16:48:12 +02:00
Andy Scherzinger
270fea6a33
fix for the grid footer
2015-08-05 15:21:05 +02:00
Andy Scherzinger
b276b623a9
added bottom padding to logo, logo slightly bigger
2015-08-05 14:48:04 +02:00
Andy Scherzinger
5ded9e818b
aligned account name with menu items
2015-08-05 14:07:00 +02:00
Andy Scherzinger
c2418d24d5
added missing progressbar
2015-08-05 13:43:23 +02:00
Andy Scherzinger
b5f8c0b087
changed alignment of drawer's content according to jan's suggestions
2015-08-04 19:02:36 +02:00
Andy Scherzinger
e36349f77e
fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment
2015-08-04 18:32:33 +02:00
Andy Scherzinger
f7f468b578
extracted color values for download fragment, see comments 172c3f56a3
2015-08-04 17:06:27 +02:00
Andy Scherzinger
a329d49ddf
Fix for color reference in portrait 8f401a38d8 (comments)
2015-08-04 16:49:20 +02:00
Andy Scherzinger
10c5498879
extracted text colors for account setup to color.xml, see e72caebbce
comments
2015-08-04 16:41:53 +02:00
AndyScherzinger
bfea14e876
setting the username on the drawer header for startup and coming back from the preferences screen for account switching
2015-07-27 20:20:46 +02:00
AndyScherzinger
8c0376229e
changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076
2015-07-27 16:33:10 +02:00
AndyScherzinger
ff2d55cede
replaced hard coded background color with coresponding color-definition
2015-07-27 16:18:53 +02:00
AndyScherzinger
172c3f56a3
colored background black for image download #710 as proposed by @jancborchardt
2015-07-27 01:00:51 +02:00
AndyScherzinger
e72caebbce
fine tuning icon work on login screen, making landscape visually en par with portrait mode
2015-07-26 18:36:00 +02:00
AndyScherzinger
49b3acd2be
added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore
2015-07-26 17:52:29 +02:00
AndyScherzinger
0c3e198e77
download fixing for #710
2015-07-26 02:54:03 +02:00
AndyScherzinger
8f401a38d8
redone color changes for login screen
2015-07-26 02:10:51 +02:00
AndyScherzinger
d474239b21
initial material design changes for the action bar
2015-07-26 01:49:27 +02:00
purigarcia
61e6191342
change the name of the method from keepInSync to favorite. Other changes commented in the review
2015-07-22 18:13:45 +02:00
tobiasKaminsky
0527754c50
add checker background pattern for all png images.
2015-07-11 09:18:26 +02:00
Jorge Antonio Diaz-Benito Soriano
9a2f6c6c4b
Support margins for API levels pre-17
2015-06-24 22:12:36 +02:00
masensio
84678c9903
Fix: Import file from other app shows all folders as TextView
2015-06-22 12:58:41 +02:00
David A. Velasco
66f3a45d05
Merge branch 'develop' into navigationDrawer_basic
...
Conflicts FIXED:
res/layout/files.xml
2015-06-15 13:43:17 +02:00
purigarcia
916bd5c6ca
Merge branch 'develop' into automationTest
2015-05-29 14:17:52 +02:00
David A. Velasco
41b5eb13b1
Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
2015-05-29 13:46:30 +02:00
David A. Velasco
27148acf16
Fixed style in log-in activity; should be Light, as before
2015-05-29 13:30:02 +02:00
masensio
cf535b70f1
Disable 'Accounts' in Navigation Drawer
2015-05-29 11:32:36 +02:00
masensio
6e2dd6b191
Enable fitsSystemWindows in drawer.xml
2015-05-28 13:18:56 +02:00
masensio
c83925b454
Add license in some files
2015-05-28 11:30:02 +02:00
masensio
db01425a07
Add NavigationDrawer to image preview
2015-05-28 11:07:14 +02:00
masensio
c20041d157
Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update
...
Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-05-27 14:19:30 +02:00
masensio
a9dad9e480
Add content_description to Navigation Drawer options
2015-05-26 11:46:15 +02:00
masensio
4f2f0ceb80
Add actionBar
2015-05-25 12:39:05 +02:00
tobiasKaminsky
6d4207a06b
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
2015-05-21 21:12:44 +02:00
David A. Velasco
a3642ab864
Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale
2015-05-18 14:29:00 +02:00
purigarcia
6a9dfdb330
Merge branch 'develop' into automationTest
2015-05-06 19:05:03 +02:00
David A. Velasco
fdc1216471
Prevent that input fields are maximized in landscape
2015-05-05 12:27:57 +02:00
David A. Velasco
4f0cc76a12
Removed unneeded toggling on cursor visibility
2015-05-05 09:54:49 +02:00
David A. Velasco
510c00f66d
Cleaned code in PassCodeActivity
2015-05-05 00:07:24 +02:00
David A. Velasco
9593b580b7
Replaced 'PIN code' by 'pass code'
2015-05-04 11:41:09 +02:00
purigarcia
d8e954d2d3
add id and contentdescription to a layout
2015-03-25 18:54:10 +01:00
masensio
c0da8a93f2
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
2015-03-20 14:55:48 +01:00
David A. Velasco
5ebd90ed2d
Merge pull request #914 from owncloud/accessibility
...
Added accesibility descriptions as a mean to add automatic tests un UI.
2015-03-19 12:59:17 +01:00
masensio
876204faf0
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
2015-03-16 11:15:27 +01:00
masensio
c963eb0fad
Merge branch 'develop' into accessibility
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2015-03-10 14:58:21 +01:00
masensio
82fa95fe43
Merge branch 'develop' into share_password_support
2015-03-06 10:19:06 +01:00
masensio
9da433bb7b
Changes from comments in PR
2015-03-06 09:07:44 +01:00
masensio
690341af68
Create layout for password
2015-03-05 17:02:40 +01:00
masensio
0bef9fdedb
Update year in license
2015-03-05 13:27:45 +01:00
David A. Velasco
2cfed6eaa7
Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts
2015-02-17 14:00:18 +01:00
David A. Velasco
e4e50d44c4
Corrections from my own comments
2015-02-03 09:52:22 +01:00
masensio
0b8f3db914
Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon
2015-01-28 08:59:57 +01:00
masensio
8ebaba45e7
Show status icons in gridview
2015-01-27 13:51:44 +01:00
masensio
051265620c
Add share icons and localFileIndicator to grid_image and grid_item layout
2015-01-27 09:46:19 +01:00
jabarros
0470de47e0
Fixed. Line behind the folder is not shown in the upload view
2015-01-22 09:29:36 +01:00
jabarros
38ea01dc1e
Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/
2015-01-21 17:51:16 +01:00
jabarros
9b1b5f5e3b
Fixed. Footer message should be showed in the list view mode. Also added in grid view mode.
2015-01-21 11:08:15 +01:00
jabarros
f01156527a
Fix. Uploads view is not shown correctly
2015-01-20 14:38:32 +01:00
jabarros
d751df3daa
Add Scrollview in list fragment layout for showing text message
2015-01-20 10:43:39 +01:00
tobiasKaminsky
b5fdba576f
changes as requested
2015-01-19 22:13:45 +01:00
tobiasKaminsky
6d5c6f86e5
Merge branch 'develop2' into imageGrid2
...
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-01-18 17:00:29 +01:00
tobiasKaminsky
d54345d040
Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
...
Conflicts:
src/com/owncloud/android/ui/activity/Uploader.java
2015-01-08 22:41:41 +01:00
jabarros
3929f1e740
Add content description tag into EditText in account_setup
2015-01-08 13:07:54 +01:00
tobiasKaminsky
0ae80926ac
update
2015-01-05 19:53:40 +01:00
tobiasKaminsky
9b61fc9af6
- fixes #674 , #198
2014-12-27 09:08:11 +01:00
jabarros
6f11fa1c09
Added content description tag in 'account setup' layout elements
2014-12-18 12:22:07 +01:00
Luke Owncloud
e764c7d9f3
added progressbar for current item in upload list
2014-12-15 08:46:04 +01:00
Luke Owncloud
a8e2cf6eae
tried to add clear button for upload groups. would be too much.
2014-12-12 12:01:04 +01:00
Luke Owncloud
0da591d585
give upload items as much vertical space as they need (wrap content)
2014-12-12 11:04:10 +01:00
Luke Owncloud
3fdb78d0c9
added right button for items in upload list (for cancel, retry, and remove)
2014-12-12 10:59:44 +01:00
Luke Owncloud
11efd022f9
use settings layout for upload list (remove group header background, add underline, remove group icons)
2014-12-10 13:44:20 +01:00
jabarros
0df8f178de
Merge pull request #754 from owncloud/RadioListOnAccounts
...
Account list is now a radiobutton list
2014-12-10 08:45:12 +01:00
Luke Owncloud
fd6d57fa75
removed unnecessary items from upload_list_item
2014-12-10 08:18:12 +01:00
Luke Owncloud
0c0ef5402d
change upload list layout according to https://github.com/owncloud/android/issues/765#issuecomment-65076426
2014-12-08 17:03:46 +01:00
Luke Owncloud
2d0c347bc4
Merge remote-tracking branch 'upstream/develop' into HEAD
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-12-08 16:24:10 +01:00
Jorge Antonio Diaz-Benito Soriano
49e8dafac0
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
...
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2014-12-03 15:08:45 +01:00
David A. Velasco
50e39f044f
Merge branch 'master' into develop
2014-12-03 11:31:49 +01:00
Luke Owncloud
0ff6921665
git added filesize
...
improving status messages
2014-11-30 20:18:27 +01:00
Luke Owncloud
eaab185720
introduce divisions in upload list view
2014-11-27 14:26:31 +01:00
Luke Owncloud
37d3a72960
add ExpandableListFragment which is inherits from ExtendedListFragment
...
Only difference: it uses an ExpandableListView which supports dividing list into groups
2014-11-27 11:56:24 +01:00
tobiasKaminsky
611905a5d0
- Account list is now a radiobutton list
2014-11-25 17:42:41 +01:00
tobiasKaminsky
ae6b686775
Merge remote-tracking branch 'upstream/develop' into fileCount
2014-11-21 17:59:51 +01:00
tobiasKaminsky
4867bb32c3
Merge remote-tracking branch 'upstream/develop' into imageGrid
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-11-18 18:08:28 +01:00
jabarros
dc8a495e55
Remove files_move layout after creating files_folder_picker one
2014-11-18 14:53:41 +01:00
jabarros
00a8eb415a
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
2014-11-18 14:51:49 +01:00
Jorge Antonio Diaz-Benito Soriano
da2702129f
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files
2014-11-17 14:10:55 +01:00
Luke Owncloud
2b85ed59b4
working on UploadListActivity
2014-11-14 17:02:58 +01:00
Luke Owncloud
1664d9ec68
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-11-14 13:09:01 +01:00
David A. Velasco
17afcb0251
Merge pull request #683 from tobiasKaminsky/videoFullsize
...
Bugfix: video is now playing in fullscreen
2014-11-12 09:29:28 +01:00
tobiasKaminsky
4560776ecc
- use match_parent instead
2014-11-10 20:14:45 +01:00
Luke Owncloud
d59fd3b77a
consistently use UploadList (instead UploadsList)
2014-11-07 15:38:21 +01:00
Luke Owncloud
79c3756857
undo unintended change
2014-11-07 15:32:41 +01:00
Luke Owncloud
ba7e62e9f3
added first draft of uploadListActivity
2014-11-07 15:26:21 +01:00
tobiasKaminsky
f331120a14
Merge remote-tracking branch 'upstream/develop' into imageGrid
...
Conflicts:
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
2014-11-05 22:07:11 +01:00
David A. Velasco
a09a837585
Adjust the thumbnails size to the size used on screen
2014-11-03 11:27:51 +01:00
tobiasKaminsky
ccdf0f1b96
- adding possibility to create folder during upload
2014-11-01 13:41:06 +01:00
Jorge Antonio Diaz-Benito Soriano
093bf4fb5c
Reverted the text preview system to a single TextView
2014-10-28 19:11:31 +01:00
Jorge Antonio Diaz-Benito Soriano
0c384167c1
Added some margins.
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
3877ddf85a
Minor updates
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
65e82bff36
Removed any remains of list appearance
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
ec9f1c7eb8
Reworked the text file preview system to avoid UI freezes with large text files
2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano
7cc88a22d1
Added text file preview
2014-10-28 19:11:30 +01:00
tobiasKaminsky
b18fabe9d7
- bugfix: video is now playing in fullscreen
2014-10-25 18:55:15 +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
tobiasKaminsky
635394f2a2
- minor design changes
2014-10-19 08:56:57 +02:00
tobiasKaminsky
4e960eafeb
added "x folders and y files" to end of list
2014-10-18 10:47:08 +02:00
tobiasKaminsky
9bdebfa88f
- switch to 72dp
...
- sharedWithMe default invisible
2014-09-22 17:52:52 +02:00
jabarros
cf97936b76
Add customize Imageview and TouchImageView for fixing problem of seeing big pictures on nexus 7
...
:q
exit
:q
2014-09-22 09:27:23 +02:00
tobiasKaminsky
07e4eaac9a
changed do 64x64 filetype icons
2014-09-21 19:19:25 +02:00
tobiasKaminsky
5434504486
- renamed ImageViews
...
- switch to 80x80px filetype icon
2014-09-18 21:36:43 +02:00
David A. Velasco
aa354e5d73
Merge branch 'develop' into release-1.6.0
2014-09-18 14:27:13 +02:00
jabarros
c3e3160727
Fixed bug. When downloading two files, it is not possible to come back to the file list. Bars does not appear.
2014-09-18 09:36:35 +02:00
tobiasKaminsky
3cab2038a3
3row Grid
2014-09-17 17:21:26 +02:00
jabarros
74c29e1ce1
Changes after CR
2014-09-17 16:46:11 +02:00
jabarros
2ef886af31
Merge branch 'develop' into better_loggin_system
2014-09-17 09:47:34 +02:00
tobiasKaminsky
ca59c75371
- GridLayout
2014-09-15 19:12:12 +02:00
tobiasKaminsky
4f1b50795c
Beginning gridView
2014-09-15 09:41:54 +02:00
jabarros
2ada53c99b
Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached.
2014-09-04 09:06:14 +02:00
jabarros
dc984ec5bf
Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders
2014-08-13 16:43:50 +02:00
David A. Velasco
41666b2d6c
Merge pull request #578 from owncloud/show_message_for_empty_list
...
Show background message when list of files is empty
2014-07-30 09:40:17 +02:00
jabarros
ac18a468e8
Changes after CR
2014-07-30 09:35:31 +02:00
jabarros
5335975717
Fixed bug. It is not possible to refresh folder when it is empty
2014-07-29 15:04:06 +02:00
jabarros
20bb37701c
Use Extended view pager and set onTouchListener into image forshow/hide the action bar
2014-07-29 08:26:10 +02:00
jabarros
a8c4271673
Change element ImageView of preview image fragment for TouchImageView in order to allow make zoom on the image
2014-07-28 11:11:28 +02:00
jabarros
89e7ad9e67
Show message when the file list is being loading and when it is empty
2014-07-25 13:13:58 +02:00
jabarros
fb1a4bad59
Add message when LocalFileList and OCFileLIst are empty
2014-07-24 18:34:12 +02:00
jabarros
055be96386
Remove InstantUploadActivity and related resources
2014-07-14 08:40:16 +02:00
jabarros
ab5e9250d2
Fixed bug. The size of a file is moved to the left when it is shared by link
2014-07-09 17:52:52 +02:00
jabarros
64a94f351d
Fixed bug. Icons are not shown correctly in the file list
2014-07-09 17:26:20 +02:00
jabarros
df5fe2d648
Change the star and downloaded/downloading/uploading icons in list_item layout desing
2014-07-09 09:09:37 +02:00
jabarros
96e2d198e0
Merge branch 'develop' into release-1.5.8
2014-07-08 13:03:09 +02:00