mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity
3164 commits 225 branches 1574 tags 621 MiB
Commit graph

378 commits

Author SHA1 Message Date
masensio
e18de547c8 Update user agent string 2015-03-24 14:53:53 +01:00
masensio
0de25b228c Update uger agent string 2015-03-24 14:44:05 +01:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
David A. Velasco
28e4b35595 Quotes updated in subject message for shared link, better format string 2015-02-03 13:17:14 +01:00
David A. Velasco
4af15f7b4e Merge branch 'develop' into imageGrid 2015-02-02 13:48:30 +01:00
jabarros
0470de47e0 Fixed. Line behind the folder is not shown in the upload view 2015-01-22 09:29:36 +01:00
tobiasKaminsky
b5fdba576f changes as requested 2015-01-19 22:13:45 +01:00
tobiasKaminsky
d4e0f3bdb1 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-19 21:02:37 +01:00
jabarros
d05d5ffe1a Merge branch 'develop' into download_folder 2015-01-07 14:04:46 +01:00
jabarros
f737785b4f Change error message when trying download a folder that does not exist 2015-01-07 13:47:38 +01:00
jabarros
90e49a96e4 Added folder name to 'file not found' error message 2015-01-07 13:04:46 +01:00
jabarros
1db11eb586 Fix. App does not realize that the folder does not exist 2015-01-07 11:22:24 +01:00
jabarros
f0905fbaac Merge pull request #784 from ekeitho/develop 
subject mail populated when user shares >>file/folder<<
 2014-12-26 09:04:02 +01:00
Keith Abdulla
150050aeb0 fix tab indent 2014-12-23 09:38:38 -08:00
Keith Abdulla
1db0d7daf2 create an extra string resource 2014-12-23 09:31:59 -08:00
jabarros
c34646aed3 Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation 2014-12-10 14:13:32 +01:00
Keith Abdulla
3d8174a73e fix tab 2014-12-09 23:01:48 -08:00
Keith Abdulla
1704c4f788 move subject message strings into strings.xml 2014-12-09 17:51:10 -08:00
David A. Velasco
50e39f044f Merge branch 'master' into develop 2014-12-03 11:31:49 +01:00
tobiasKaminsky
ae6b686775 Merge remote-tracking branch 'upstream/develop' into fileCount 2014-11-21 17:59:51 +01:00
Luke Owncloud
8de07698d9 integrating @davivels remarks 2014-11-20 13:46:54 +01:00
jabarros
a2de2f28ab Add new preference on settings for setting the upload video path 2014-11-19 10:14:27 +01:00
jabarros
00a8eb415a Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend 2014-11-18 14:51:49 +01:00
tobiasKaminsky
79cb6106fd Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps 
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
 2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4 < 60 seconds -> "seconds ago" 2014-11-12 08:56:53 +01:00
jabarros
eb77fe1da1 Merge pull request #700 from owncloud/remember_last_share_location_fixed 
Remember last share location
 2014-11-05 08:36:16 +01:00
David A. Velasco
a09a837585 Adjust the thumbnails size to the size used on screen 2014-11-03 11:27:51 +01:00
David A. Velasco
0bedcb9128 Merge branch 'remember_last_share_location' into remember_last_share_location_fixed 2014-10-31 15:23:59 +01:00
Luke Owncloud
035fc24a17 allow user to save choice of app for sending log 
warn user if no app for sending log available
 2014-10-30 09:53:24 +01:00
Luke Owncloud
5caa8d25a0 use chooser for sendmail (remove explicit gmail) in LogHistory 2014-10-29 12:39:44 +01: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
jabarros
6970560d2f Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-23 11:06:05 +02:00
jabarros
2fad1e1a99 Merge branch 'develop' into sorting_files_2 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-23 10:18:20 +02:00
jabarros
3a8ff76d0a Merge branch 'master' into develop 
Conflicts:
	owncloud-android-library
 2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
844790057b Merge with develop 2014-10-20 14:38:13 +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
Magnus Sjoqvist
b6c7719415 Merge with develop 2014-10-17 11:06:30 +02:00
jabarros
016bdfac1f Fixed. Upload path is not place correctly in setting view 2014-10-15 08:21:23 +02:00
Magnus Sjoqvist
ebe0f73068 Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences. 2014-10-14 09:34:49 +02:00
tobiasKaminsky
706a769e30 - disabled sort by size until server supports server-side folder size 
calculation
 2014-10-11 09:14:14 +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
1e7e893321 Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable 2014-10-06 14:58:34 +02:00
jabarros
2e472998c1 Merge branch 'develop' into release-1.6.0 2014-10-02 09:04:11 +02:00
loripino21
47d1a5e3e4 Update strings.xml 2014-09-23 10:08:40 +02:00