Commit graph

16 commits

Author SHA1 Message Date
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
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
jabarros
e9016281bd Add contentDescription tag into main menu items 2015-01-12 13:25:07 +01: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
7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-10-09 17:26:02 +02:00
tobiasKaminsky
20cd00b22c Added sorting by name, date or size ascending/descending 2014-09-14 15:51:09 +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
masensio
d164646e28 On any device, any orientation, show the icons for Upload and New folder directly in the bar. 2014-04-03 10:08:57 +02:00
masensio
c3da11d244 Revert "Add different action bar configuration for landscape and portrait"
This reverts commit 6dde4ddd3a.
2014-04-02 11:19:08 +02:00
masensio
6dde4ddd3a Add different action bar configuration for landscape and portrait 2014-04-02 11:15:05 +02:00
Philippe MARASSE
28ef4217e5 updated menu from github comments 2014-03-17 22:15:41 +01:00
Philippe MARASSE
24356ea250 Modified actionbar to allow display of icon+text on tablets 2014-02-08 22:19:54 +01:00
David A. Velasco
bdc0332c23 Copyright note fixes 2013-04-17 12:26:13 +02:00
David A. Velasco
be51b2c4aa Fixed regression after merge: removed 'about' entry in menu 2013-04-15 13:48:04 +02:00
David A. Velasco
77ddd1ccb6 Merge branch 'develop' into feature_previews
Conflicts:
	AndroidManifest.xml
	res/menu/file_context_menu.xml
	res/menu/menu.xml
	res/values-de-rDE/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:44:30 +02:00
David A. Velasco
f2474ae28d Added basic menu options to the preview fragment: open, delete, see details 2013-02-18 11:23:18 +01:00