mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 06:51:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
4088 commits 221 branches 1585 tags 636 MiB
Commit graph

1600 commits

Author SHA1 Message Date
masensio
8e3d7bdc8f Create the layout to share with a user 2015-10-30 15:10:42 +01:00
masensio
3a527a8fe4 Add 'Share with users/groups' to long press menu 2015-10-30 15:04:34 +01:00
Maria Asensio
eaa0612bfa Merge pull request #1109 from owncloud/sync_full_folder 
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
 2015-10-30 14:14:52 +01:00
Jenkins for ownCloud
720c49136a [tx-robot] updated from transifex 2015-10-30 01:13:47 -04:00
Jenkins for ownCloud
00c6d8bffe [tx-robot] updated from transifex 2015-10-29 01:13:42 -04:00
masensio
b9ef747a0b Merge branch 'master' into sync_full_folder 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/files/services/FileUploader.java
 2015-10-27 08:52:17 +01:00
Jenkins for ownCloud
3918ec18a8 [tx-robot] updated from transifex 2015-10-27 01:13:47 -04:00
Jenkins for ownCloud
2702951056 [tx-robot] updated from transifex 2015-10-23 01:13:41 -04:00
David A. Velasco
08443f90c5 Merge pull request #1177 from owncloud/notification_coloring 
Add ownCloud color to notifications for lollipop
 2015-10-22 09:10:10 +02:00
Andy Scherzinger
dffd81e00c removed primary color usage for textColor of the input fields on the loginscreen 2015-10-21 11:31:58 +02:00
Jenkins for ownCloud
8269b6dee6 [tx-robot] updated from transifex 2015-10-21 01:13:40 -04:00
Jenkins for ownCloud
1db483d521 [tx-robot] updated from transifex 2015-10-20 01:13:41 -04:00
Jenkins for ownCloud
d1dfc9958d [tx-robot] updated from transifex 2015-10-19 01:13:44 -04:00
Jenkins for ownCloud
47e74b6271 [tx-robot] updated from transifex 2015-10-18 01:13:42 -04:00
Jenkins for ownCloud
185b670e5c [tx-robot] updated from transifex 2015-10-17 01:13:48 -04:00
Andy Scherzinger
c56b3568c5 Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-14 10:34:48 +02:00
Jenkins for ownCloud
c47b0ab77a [tx-robot] updated from transifex 2015-10-14 01:13:38 -04:00
Jenkins for ownCloud
28198ee983 [tx-robot] updated from transifex 2015-10-13 01:13:37 -04:00
Jenkins for ownCloud
a317483f44 [tx-robot] updated from transifex 2015-10-12 01:13:37 -04:00
Jenkins for ownCloud
42f38fe876 [tx-robot] updated from transifex 2015-10-11 01:13:36 -04:00
Jenkins for ownCloud
f206eaaeb4 [tx-robot] updated from transifex 2015-10-10 01:13:37 -04:00
Andy Scherzinger
a61f862677 directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms. 2015-10-09 15:04:39 +02:00
Jenkins for ownCloud
f9b7cbd2d5 [tx-robot] updated from transifex 2015-10-09 01:13:37 -04:00
Maria Asensio
567355eed0 Merge pull request #1190 from owncloud/1182_Open_With_Fix 
Fix for #1182 on Android 5
 2015-10-07 11:19:16 +02:00
Jenkins for ownCloud
8ba051f851 [tx-robot] updated from transifex 2015-10-07 01:13:37 -04:00
Jenkins for ownCloud
435d4969fe [tx-robot] updated from transifex 2015-10-06 01:13:31 -04:00
Andy Scherzinger
8f0ea82efd Fix for #1182 on Android 5 2015-10-05 18:44:50 +02:00
Jenkins for ownCloud
eddd3aa450 [tx-robot] updated from transifex 2015-10-04 01:13:38 -04:00
Jenkins for ownCloud
f056247e75 [tx-robot] updated from transifex 2015-10-03 01:13:37 -04:00
Wikinaut
cf063bf04a fix #1024 show cert fingerprints when adding new account w/ untrusted cert 
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
  instead of signature hex dump
  when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
 2015-10-02 02:39:10 +02: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
masensio
9494620cc4 Merge branch 'master' into sync_full_folder 
Conflicts:
	src/com/owncloud/android/providers/FileContentProvider.java
 2015-09-30 12:24:01 +02:00
masensio
8090269d55 Merge branch 'master' of github.com:owncloud/android 
Conflicts:
	CHANGELOG.md
 2015-09-30 10:49:47 +02:00
Jenkins for ownCloud
b6c5188fd0 [tx-robot] updated from transifex 2015-09-29 01:13:58 -04:00
masensio
4316d7082f Remove strings for values-en_DE 2015-09-28 13:57:22 +02:00
masensio
ee9aa68d23 Merge branch 'release-1.8' 2015-09-28 12:33:47 +02:00
Jenkins for ownCloud
9a3872d003 [tx-robot] updated from transifex 2015-09-28 02:33:53 -04:00
David A. Velasco
056b7c964d Updated error message for failed folder synchronization ('download' not anymore) 2015-09-25 15:13:59 +02:00
David A. Velasco
e6c1454458 Persist conflicts in local database and show with an icon in the list of files 2015-09-25 15:13:46 +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
David A. Velasco
e885c78dc7 Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside 2015-09-25 15:13:38 +02:00
David A. Velasco
ac685690a2 Extend SyncFolderOperation to check local changes of all files and trigger uploads 2015-09-25 15:13:35 +02:00
David A. Velasco
a38461aaa5 Same style for log-in buttons in potrait and landscape 2015-09-25 13:54:53 +02:00
David A. Velasco
c44ed4980c Fixed lost background color for icon in login view 2015-09-25 11:11:46 +02:00
Jenkins for ownCloud
92c39be013 [tx-robot] updated from transifex 2015-09-22 01:13:44 -04:00
Jenkins for ownCloud
664450a6bf [tx-robot] updated from transifex 2015-09-21 01:13:34 -04:00
Andy Scherzinger
f6b2b856cb Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192 2015-09-17 11:46:37 +02:00
Jenkins for ownCloud
0cb5cee031 [tx-robot] updated from transifex 2015-09-17 01:13:47 -04:00
masensio
459bd1e9d0 Merge pull request #1157 from owncloud/fix_file_list_icon_alignment 
center aligned the folder icon with the drawer icon
 2015-09-16 12:34:30 +02:00
Andy Scherzinger
4c0371f82b center aligned the folder icon with the drawer icon 2015-09-16 11:41:37 +02:00
masensio
359ede5fdd Merge pull request #1149 from owncloud/new_filetype_icons 
New icon detection in general + support for additional mimetype icons
 2015-09-16 11:39:26 +02:00
David A. Velasco
eaf249803c Removed unneeded LDPI drawables 2015-09-15 18:08:00 +02:00
David A. Velasco
0290523c03 Added icons for file type TEXT 2015-09-15 18:07:59 +02:00
Andy Scherzinger
3ff4d6df0f adapting web's way of choosing icons 2015-09-15 18:02:34 +02:00
Jenkins for ownCloud
9b8b29d98b [tx-robot] updated from transifex 2015-09-14 01:13:43 -04:00
Jenkins for ownCloud
83eed1a8d8 [tx-robot] updated from transifex 2015-09-12 01:13:45 -04:00
David A. Velasco
7182b1d2b1 Merge pull request #1141 from owncloud/559_longpress_filename 
Show file name in the contextual menu, see #559
 2015-09-11 12:37:04 +02:00
Jenkins for ownCloud
7ae7cef2b3 [tx-robot] updated from transifex 2015-09-11 01:13:42 -04:00
Marc Plano-Lesay
b4875c69cc Add additional filetype icons 2015-09-09 23:30:09 +02:00
masensio
84a4a086d6 Merge pull request #1124 from Kernald/new-filetype-icons 
New filetype icons
 2015-09-09 08:50:50 +02:00
Jenkins for ownCloud
fbe533c974 [tx-robot] updated from transifex 2015-09-09 01:13:45 -04:00
Jenkins for ownCloud
1d4b191fb3 [tx-robot] updated from transifex 2015-09-08 01:13:44 -04:00
Andy Scherzinger
e9f793755e showing the filename in the long press menu on file list, see #559 2015-09-07 12:24:01 +02:00
masensio
1586eea7cb Merge branch 'master' into text_file_preview_pr_707_with_develop 2015-09-07 10:42:09 +02:00
David A. Velasco
1ff57e0665 HOT FIX: recovered lost strings 2015-09-07 10:07:54 +02:00
Jenkins for ownCloud
244f3bd4e4 [tx-robot] updated from transifex 2015-09-07 01:13:41 -04:00
Jenkins for ownCloud
5ceecb4a82 [tx-robot] updated from transifex 2015-09-06 01:13:44 -04:00
Jenkins for ownCloud
11c0d77648 [tx-robot] updated from transifex 2015-09-05 01:13:44 -04:00
masensio
fc5c4d899c Merge branch 'master' into text_file_preview_pr_707_with_develop 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-09-04 14:31:10 +02:00
masensio
f787213cd1 Merge pull request #1102 from owncloud/copy 
Copy files
 2015-09-04 11:14:42 +02:00
Jenkins for ownCloud
f70de1736e [tx-robot] updated from transifex 2015-09-04 01:13:40 -04:00
masensio
a0707428ff Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop 
Conflicts:
	res/layout/file_preview.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2015-09-02 13:23:42 +02:00
Jenkins for ownCloud
2b001a8bf2 [tx-robot] updated from transifex 2015-09-02 07:06:14 -04:00
Jenkins for ownCloud
f70817f5fb [tx-robot] updated from transifex 2015-09-01 13:02:18 -04: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
Marc Plano-Lesay
502ff0a216 Use new filetype icons 2015-08-31 19:17:05 +02:00
David A. Velasco
136db6a765 Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader 
'Create folder' button moved to action bar in Uploader activity
 2015-08-31 17:48:12 +02:00
Jenkins for ownCloud
ef7cf6edb0 [tx-robot] updated from transifex 2015-08-31 01:13:46 -04:00
Jenkins for ownCloud
11fa921860 [tx-robot] updated from transifex 2015-08-28 01:13:40 -04:00
Jenkins for ownCloud
6b8a052a5e [tx-robot] updated from transifex 2015-08-27 01:13:43 -04:00
Jenkins for ownCloud
8ecfdfe614 [tx-robot] updated from transifex 2015-08-26 01:13:41 -04:00
masensio
b81de1d547 Merge branch 'master' into create_folder_button_on_action_bar_for_uploader 
Conflicts:
	res/layout/uploader_layout.xml
 2015-08-25 14:53:42 +02:00
Jenkins for ownCloud
8f0a83a495 [tx-robot] updated from transifex 2015-08-25 01:13:43 -04:00
Jenkins for ownCloud
573b9d1727 [tx-robot] updated from transifex 2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
806f258bbd [tx-robot] updated from transifex 2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
763ecd2d84 [tx-robot] updated from transifex 2015-08-24 12:38:29 +02:00
Jenkins for ownCloud
9448a809b1 [tx-robot] updated from transifex 2015-08-24 12:38:28 +02:00
tobiasKaminsky
8e3787909f Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground 2015-08-21 17:48:58 +02:00
Andy Scherzinger
a544a0cfb6 correct copyright info 2015-08-20 13:08:28 +02:00
Andy Scherzinger
cbb0f8743f Fix for long click menue for account management in preferences screen 2015-08-18 23:13:10 +02:00
Andy Scherzinger
dbed65610b fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle 2015-08-18 22:09:53 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76 Added error messages for copy action. English only. 2015-08-18 17:04:47 +02:00
Andy Scherzinger
e79f92f566 Conflict Dialog Fix 2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94 Added error messages for copy action. English only. 2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8 Added copy action 2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774 visual fix for Progress DialogFragment(s) 2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano
f4432afdeb Added 'Copy' action 2015-08-18 10:58:37 +02:00
Andy Scherzinger
3a82db451c Merge branch 'master' of https://github.com/owncloud/android into material_toolbar 2015-08-17 16:13:30 +02:00
Andy Scherzinger
ba80646e4e Fix for 4.0 file action context menu (re-implement it via DialogFragment) 2015-08-17 15:58:03 +02:00