David A. Velasco
|
f6ea9b597a
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
Conflicts FIXED in res/values/styles.xml (trivial)
|
2016-03-30 13:27:09 +02:00 |
|
Andy Scherzinger
|
d893654bc1
|
Fix Headline in share edit and user search
|
2016-03-22 13:29:23 +01:00 |
|
David A. Velasco
|
52d05b37d4
|
Enabled again 'basic' recovery of instant uploads on WiFi connection
|
2016-03-03 12:52:16 +01:00 |
|
David A. Velasco
|
366a1f7c51
|
Reconnect cancellation of uploads when Wifi is lost to interrupt only-wifi instant uploads
|
2016-02-22 14:37:36 +01:00 |
|
David A. Velasco
|
286dc8fafd
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
|
2016-02-22 10:21:46 +01:00 |
|
David A. Velasco
|
40e9bb0529
|
Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented
|
2016-02-18 09:30:35 +01:00 |
|
David A. Velasco
|
05e723ba20
|
Removed unneeded request for permission WRITE_SETTINGS, and commented permissions behaviour for API level >= 23 in AndroidManifest.xml
|
2016-02-16 13:59:49 +01:00 |
|
David A. Velasco
|
82b0b7a84f
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
|
2016-02-15 14:59:04 +01:00 |
|
Andy Scherzinger
|
288b92c61a
|
marshmallow changes redone
|
2016-02-12 12:15:46 +01:00 |
|
David A. Velasco
|
0509df49ed
|
Version number up to 1.9.1
|
2016-02-04 14:51:54 +01:00 |
|
masensio
|
96ce49707b
|
Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity
|
2016-02-03 13:37:45 +01:00 |
|
masensio
|
d6653ef684
|
Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java
|
2016-02-03 13:37:43 +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 |
|
David A. Velasco
|
79c0171416
|
Removed unneeded permissions
|
2015-11-25 09:42:15 +01:00 |
|
David A. Velasco
|
36a97a091d
|
Bumped version numbers (app and workaround-app)
|
2015-11-25 09:42:13 +01:00 |
|
David A. Velasco
|
dea69d5fd7
|
Grant that any suggestion may be selected without software keyboard overlapping
|
2015-10-30 16:37:34 +01:00 |
|
David A. Velasco
|
305536f8c2
|
Users and groups retrieved from server to fill search suggestions
|
2015-10-30 16:31:08 +01:00 |
|
David A. Velasco
|
e3d509a451
|
Complete search widget to send search requests to parent activity
|
2015-10-30 16:28:35 +01:00 |
|
masensio
|
905b68b4ec
|
Show the 'search' layout in phone and tablet
|
2015-10-30 15:23:03 +01:00 |
|
masensio
|
020def3243
|
Update versionName and versionCode for version 1.8. Also in workaround
|
2015-09-16 16:54:07 +02:00 |
|
David A. Velasco
|
e6be60679f
|
Merge branch 'master' into copy
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
|
2015-09-01 18:35:51 +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
|
da89715045
|
reverted back to light colored login
|
2015-08-18 17:48:10 +02:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
97625170fa
|
Taken out old activity
|
2015-08-18 17:37:57 +02:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
3b2f51b5a5
|
Refactored functionality to use the new FolderPickerActivity class
|
2015-08-18 17:36:08 +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
|
c7205b8f56
|
Added CopyActivity
|
2015-08-18 11:39:18 +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
|
4a4296a07e
|
Material Buttons (draft)
|
2015-08-07 17:09:47 +02:00 |
|
Andy Scherzinger
|
6b6227125b
|
added back translucent action bar for image preview
|
2015-08-06 19:04:22 +02:00 |
|
AndyScherzinger
|
d474239b21
|
initial material design changes for the action bar
|
2015-07-26 01:49:27 +02:00 |
|
masensio
|
fb7692e058
|
Update versionName and versionCode in AndroidManifest.xml
|
2015-06-22 15:47:36 +02:00 |
|
masensio
|
977cf5514d
|
update minSdkVersion (to 14) in AndroidManifest.xml
|
2015-06-22 13:57:54 +02:00 |
|
David A. Velasco
|
9593b580b7
|
Replaced 'PIN code' by 'pass code'
|
2015-05-04 11:41:09 +02:00 |
|
masensio
|
b110b598b3
|
Remove READ_PHONE_STATE permission
|
2015-03-25 23:34:14 +01:00 |
|
masensio
|
fb541b1e1d
|
Update Version Number and Version Name
|
2015-03-25 23:19:39 +01:00 |
|
masensio
|
cb175f2994
|
Merge branch 'develop' into cancel_transfer_for_deleted_users
Conflicts:
AndroidManifest.xml
|
2015-02-19 12:54:59 +01:00 |
|
masensio
|
2058391230
|
Cancel downloads for deleted users
|
2015-02-18 18:39:10 +01:00 |
|
David A. Velasco
|
1ee808f3a2
|
Updated version number to 1.7.0
|
2015-02-03 12:52:17 +01:00 |
|
David A. Velasco
|
2f4e2808d2
|
Internal version bump
|
2015-01-30 11:49:31 +01:00 |
|
David A. Velasco
|
c21c8e118b
|
Version bump
|
2015-01-26 11:49:27 +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 |
|
Luke Owncloud
|
6ca1c343d6
|
remove debug tag
|
2014-11-26 14:39:17 +01:00 |
|
David A. Velasco
|
44c0d86ede
|
Merge pull request #752 from owncloud/instant_uploads_set_path
Better UI for settings path of instant uploads
|
2014-11-26 13:10:04 +01:00 |
|
jabarros
|
5c0e9ca5f2
|
Changes after CR
|
2014-11-26 09:05:23 +01:00 |
|
Luke Owncloud
|
1096f40b8d
|
making UploadService an IntentService
added menu for uploadListActivity
created separate ConnectivityActionReceiver
|
2014-11-25 16:59:34 +01:00 |
|
jabarros
|
8d505deed1
|
Update version number and name
|
2014-11-20 18:01:05 +01:00 |
|
jabarros
|
00a8eb415a
|
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
|
2014-11-18 14:51:49 +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 |
|