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 |
|
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 |
|
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 |
|
jabarros
|
6f11fa1c09
|
Added content description tag in 'account setup' layout elements
|
2014-12-18 12:22:07 +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 |
|
David A. Velasco
|
50e39f044f
|
Merge branch 'master' into develop
|
2014-12-03 11:31:49 +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 |
|
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 |
|
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 |
|
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 |
|