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 |
|
jabarros
|
fbe0568883
|
Add into file_actions_menu xml the 'move' option
|
2014-08-11 14:39:44 +02:00 |
|
jabarros
|
c4359ce393
|
Remove classes not used more after changing the view of OC accounts
|
2014-08-07 16:23:42 +02:00 |
|
jabarros
|
04ddaaef6b
|
Fixed bug. Changed icon for 'send' option in file actions menu
|
2014-07-15 12:45:28 +02:00 |
|
jabarros
|
b0eeca0e80
|
Fixed bug. Changed icons for 'open file with' and 'rename' file options
|
2014-07-15 10:09:33 +02:00 |
|
David A. Velasco
|
1ced3ca77b
|
Moved 'see details' to the last position of menu
|
2014-05-12 12:17:57 +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 |
|
masensio
|
0b42d2e626
|
Merge commit 'refs/pr/392' into improve_action_bar_pr_392_with_develop
|
2014-03-31 09:46:05 +02:00 |
|
Philippe MARASSE
|
28ef4217e5
|
updated menu from github comments
|
2014-03-17 22:15:41 +01:00 |
|
masensio
|
a5db2c2f68
|
HotFix to add Send File option, after PR#311
|
2014-02-17 09:16:29 +01:00 |
|
masensio
|
7ead9a0fe4
|
Merge pull request #311 from tobiasKaminsky/develop
Added support for sharing files:
|
2014-02-14 14:59:24 +01:00 |
|
Philippe MARASSE
|
24356ea250
|
Modified actionbar to allow display of icon+text on tablets
|
2014-02-08 22:19:54 +01:00 |
|
masensio
|
2b8588ab0b
|
OC-2732: Create 'unshare' option menu for a shared file/folder
|
2014-02-03 11:22:39 +01:00 |
|
David A. Velasco
|
ef0df64070
|
Added entry menu to share files, whereever actions on files can be triggered
|
2014-01-22 13:31:52 +01:00 |
|
tobiasKaminsky
|
0d01bf30c3
|
Added support for sharing files:
- Long press on file list
- Add option on ImageViewer
|
2013-11-24 10:00:04 +01:00 |
|
David A. Velasco
|
528db9b192
|
Removed unused menu a preference resources, and related code
|
2013-10-23 16:42:48 +02:00 |
|
David A. Velasco
|
1019dfc34d
|
Added new contextual option in account list to allow the user modify the password
|
2013-06-21 13:10:13 +02:00 |
|
David A. Velasco
|
f767bf3f01
|
Non-previewable file is opened after successful donwload
|
2013-05-28 13:11:57 +02:00 |
|
David A. Velasco
|
803568ab27
|
Moved buttons in details view to options/action menu
|
2013-04-22 14:34:42 +02: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 |
|
David A. Velasco
|
2623e9c195
|
Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished
|
2013-02-08 09:22:46 +01:00 |
|
David A. Velasco
|
bb257ec729
|
Updated copyright in source files
|
2013-02-07 18:45:10 +01:00 |
|
David A. Velasco
|
500cbf9cea
|
New items in the context menu for files (not folders), depending upon its state
|
2012-11-06 15:13:27 +01:00 |
|
David A. Velasco
|
454f15138e
|
Rename and remove operations connected to the contextual menu over items at the list of files
|
2012-10-31 17:41:57 +01:00 |
|
David A. Velasco
|
7c93676d6f
|
Make resource values for some hardcoded string
|
2012-07-27 15:02:03 +02:00 |
|
Bartek Przybylski
|
53bc15cdbf
|
allow username with @, hide search menu item until sherlockactionbar wont put it to master
|
2012-07-22 09:01:22 +02:00 |
|
Bartek Przybylski
|
5fc8be29f9
|
about dialog with version
|
2012-06-21 19:37:33 +02:00 |
|
Bartek Przybylski
|
9dd2cf294a
|
instant uploading, first attempt
|
2012-05-27 15:57:18 +02:00 |
|
Bartek Przybylski
|
24a1111aa1
|
making file download using progressbar view
|
2012-05-26 13:47:26 +02:00 |
|
Lennart Rosam
|
b735fc9458
|
Fixed navigation behaviour: HomeAsUp takes you up a dir
|
2012-05-25 07:01:12 +02:00 |
|
Bartek Przybylski
|
4ee419da91
|
remove preferences its not needed for now
|
2012-05-21 22:57:17 +02:00 |
|
Bartek Przybylski
|
b999f542c0
|
new icons, new uploader
|
2012-05-15 21:52:59 +02:00 |
|
Bartek Przybylski
|
2c9b84a862
|
allow account deleting from account picker
|
2012-05-13 22:28:44 +02:00 |
|
Bartek Przybylski
|
0aeb425885
|
adjusting design to holo, stability for account setup
|
2012-05-13 16:13:13 +02:00 |
|
Bartek Przybylski
|
fae44486b9
|
sync option in filelist menu
|
2012-05-04 20:34:05 +02:00 |
|
Bartek Przybylski
|
d8d535a0a2
|
handle dir creation from filelist
|
2012-04-08 00:25:51 +02:00 |
|
Bartek Przybylski
|
154bb85cf1
|
initial commit
|
2011-08-19 22:37:35 +02:00 |
|