Commit graph

91 commits

Author SHA1 Message Date
Andy Scherzinger
f7178fa837 housekeeping Preferences, removed all accounts related code 2016-06-25 16:26:57 +02:00
Andy Scherzinger
f41e567b90 general menu/account list switch implemented (open: populate account list) 2016-06-25 16:26:47 +02:00
Andy Scherzinger
ed33c0aff4 initial rewrite to make use of the toolbar 2016-06-25 16:26:44 +02:00
Andy Scherzinger
2c256bf53d added the ability to select all within a folder for upload - selection is discarded when navigating folders 2016-06-22 16:43:23 +02:00
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
masensio
573d94453b Delete context menu in UploadListFragment 2016-02-26 14:34:41 +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
d7ff626db3 added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions 2016-02-25 18:07:29 +01:00
Juan Carlos González Cabrero
9fe62d15ea Refresh listview when clear failed/finished uploads clicked 2016-02-15 10:58:53 +01:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
David A. Velasco
d26da3cbc2 Recovered changes lost in complex rebase 2016-01-05 12:12:18 +01:00
tobiasKaminsky
2586298380 moved switch menu item to three dots menu 2016-01-05 11:21:37 +01:00
tobiasKaminsky
6bd7065c73 wip 2016-01-05 11:16:00 +01:00
masensio
a840e67a68 Add 'Uploads' option into NavigationDrawer 2015-12-11 08:43:33 +01:00
masensio
dc0aea30f0 Merge branch 'master' into reliable_uploads
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/datamodel/OCFile.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/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/utils/FileStorageUtils.java
2015-12-10 17:18:52 +01:00
masensio
e08513a762 Delete any rest of old public share/unshare flow 2015-11-25 09:32:26 +01:00
masensio
ceffbc4aa8 Remove unshare with users/groups option from the menu 2015-10-30 16:39:21 +01:00
masensio
3a527a8fe4 Add 'Share with users/groups' to long press menu 2015-10-30 15:04:34 +01:00
masensio
8f67624a4f Fix: Long press menu shows two extra options: old cancel download and old cancel upload 2015-10-01 10:37:37 +02:00
David A. Velasco
9b5506f81e Join cancelation of downloads and uploads in 'cancel sync', both for files and folders 2015-09-25 15:13:41 +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
Jorge Antonio Diaz-Benito Soriano
f4432afdeb Added 'Copy' action 2015-08-18 10:58:37 +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
purigarcia
7df9aa7310 add unfavorite option in context menu 2015-07-08 08:50:24 +02:00
purigarcia
e0efee57b4 add keep up to date option in the menu 2015-07-08 08:36:10 +02:00
masensio
35eb4dbfcf Update main_menu.xml 2015-05-27 16:53:35 +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
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
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
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
Luke Owncloud
6dae38caa7 allow separately clearing failed and finished uploads 2014-12-12 11:18:55 +01:00
Luke Owncloud
9445692878 fix cancel upload
add remove single upload from list
add retry upload
2014-11-28 14:01:19 +01:00
Luke Owncloud
cf63d7ce0e remove on long click, add context menu instead 2014-11-27 16:40:52 +01:00
Luke Owncloud
1096f40b8d making UploadService an IntentService
added menu for uploadListActivity
created separate ConnectivityActionReceiver
2014-11-25 16:59:34 +01:00
Luke Owncloud
4d07fcc1a1 Merge remote-tracking branch 'upstream/develop' into reliable_uploads
Conflicts:
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
2014-11-25 14:28:05 +01:00
Luke Owncloud
d59fd3b77a consistently use UploadList (instead UploadsList) 2014-11-07 15:38:21 +01:00
Luke Owncloud
ba7e62e9f3 added first draft of uploadListActivity 2014-11-07 15:26:21 +01:00
grecep
31ffae0093 Revert "Add "select all" option to photo (or other) upload screen" 2014-10-29 22:37:45 +01:00
grecep
fd7a940dee Merge pull request #669 from grecep/master
Add "select all" option to photo (or other) upload screen
2014-10-29 22:29:38 +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
grecep
df4f60dda4 select all / deselect all file in upload menu 2014-10-10 14:05:49 +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
jabarros
2ef886af31 Merge branch 'develop' into better_loggin_system 2014-09-17 09:47:34 +02:00
tobiasKaminsky
20cd00b22c Added sorting by name, date or size ascending/descending 2014-09-14 15:51:09 +02:00
jabarros
499c691707 Changes after CR 2014-09-04 18:23:39 +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