mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
5262 commits 228 branches 1571 tags 618 MiB
Commit graph

2079 commits

Author SHA1 Message Date
Jenkins for ownCloud
185b670e5c [tx-robot] updated from transifex 2015-10-17 01:13:48 -04:00
tobiasKaminsky
e18773465d Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-10-15 18:27:07 +02:00
Andy Scherzinger
c56b3568c5 Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-14 10:34:48 +02:00
Andy Scherzinger
2610eb6805 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-14 10:33:49 +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
Andy Scherzinger
e5a61893ec Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-11 12:30:05 +02: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
Andy Scherzinger
41a883549f Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-07 19:03:23 +02: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
Andy Scherzinger
917039411c added a divider to the bottom part 2015-09-27 20:43:18 +02:00
Andy Scherzinger
2ffdb4db00 16dp right and left for checkpoxed 2015-09-27 20:32:44 +02:00
Andy Scherzinger
35a68aa337 custom list preference implementation for visual material consistency on pre-lollipop 2015-09-27 20:21:09 +02:00
tobiasKaminsky
57862ef52c added 16dp padding 2015-09-25 17:30:30 +02:00
tobiasKaminsky
ff5202a5f6 Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles 2015-09-25 17:23:31 +02:00
tobiasKaminsky
19bc90bf56 default value: do nothing 
show summary for behaviour
 2015-09-25 17:21:58 +02:00
Andy Scherzinger
5417b2a4e5 Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons 2015-09-25 16:09:01 +02: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
tobiasKaminsky
5034e42928 extracted hard-coded string to string resource 2015-09-23 19:49:01 +02:00
Andy Scherzinger
66aede2b3c Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-22 10:01:14 +02:00
Jenkins for ownCloud
92c39be013 [tx-robot] updated from transifex 2015-09-22 01:13:44 -04:00
tobiasKaminsky
2b6a61ddae #819 part3: When uploading from filesystem inside the owncloud app, show question 2015-09-21 09:45:20 +02:00
tobiasKaminsky
a64308f382 wip 2015-09-21 09:03:09 +02:00
tobiasKaminsky
a1b2655d85 wip 2015-09-21 08:57:00 +02:00
Jenkins for ownCloud
664450a6bf [tx-robot] updated from transifex 2015-09-21 01:13:34 -04:00
tobiasKaminsky
4b8a5a9c92 #819, part 2: Instant uploads, depends on setting 2015-09-19 14:33:29 +02:00
Andy Scherzinger
eb7bcfbd2e Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	owncloud-android-library
	res/layout-land/account_setup.xml
 2015-09-17 15:39:27 +02: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
Andy Scherzinger
bbbb7026b4 fix for refrsh icon in text view in landscape mode 2015-09-16 17:34:29 +02:00
Andy Scherzinger
549284e4f9 fix click listener 2015-09-16 17:31:27 +02:00
Andy Scherzinger
044c597e2b fix for refresh bug 2015-09-16 17:21:53 +02:00
Andy Scherzinger
94bc0699ac Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
fixed realignment item badges
Conflicts:
	res/layout/list_item.xml
 2015-09-16 16:27:47 +02: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
Andy Scherzinger
9e15d2459d Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons 2015-09-15 18:44:49 +02:00
Andy Scherzinger
6f5cb9aaca Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-15 18:43:48 +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
Andy Scherzinger
6eccdc25b3 Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
 2015-09-11 13:06:14 +02:00
Andy Scherzinger
13a73dd568 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-11 12:47:01 +02: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
Andy Scherzinger
0234ca22ea Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-09 11:42:11 +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
Andy Scherzinger
ed86a0560a Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-08 13:50:02 +02: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
Andy Scherzinger
6d670fb678 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-07 11:16:29 +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
Andy Scherzinger
c1e73ec56f Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-06 20:49:49 +02: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
Andy Scherzinger
e7674368e2 fix duplicate 2015-09-04 13:24:12 +02:00
Andy Scherzinger
7ac2a0d297 fix layout/uploader_layout.xml 2015-09-04 13:20:41 +02:00
Andy Scherzinger
32145d57db Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/uploader_layout.xml
 2015-09-04 13:16:11 +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
3b2c61a48c Merge branch 'master' into uploadShowsFiles 
Conflicts:
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-09-02 16:45:33 +02: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
fd39e9168b replaced the icons and header coloring 2015-08-21 17:32:24 +02:00
Andy Scherzinger
18811141fb added delete icon files 2015-08-21 17:09:18 +02:00
masensio
3c2da890ce Merge branch 'master' into reliable_uploads 2015-08-21 13:09:54 +02:00
Jenkins for ownCloud
632f3d23e0 [tx-robot] updated from transifex 2015-08-21 01:13:44 -04: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
d24b396d54 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-20 13:50:44 +02:00
Andy Scherzinger
a544a0cfb6 correct copyright info 2015-08-20 13:08:28 +02:00
Andy Scherzinger
7f13b98cc0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
 2015-08-18 23:20:01 +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
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
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
c13741ba20 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 16:14:12 +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
b669bd7737 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 16:04:17 +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
Andy Scherzinger
16a5bdc8d1 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 09:05:33 +02:00
Andy Scherzinger
80e7836840 set back font weight on drawer list items 2015-08-17 09:04:37 +02:00
Jenkins for ownCloud
ba4b258697 [tx-robot] updated from transifex 2015-08-17 01:13:37 -04:00
Jenkins for ownCloud
d09baff068 [tx-robot] updated from transifex 2015-08-15 01:13:39 -04:00
Andy Scherzinger
267179ef2e Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-14 18:55:58 +02:00
Andy Scherzinger
71f68b4c8c fix for progressbars on pre lollipop and post ics for seekbar thumbs 2015-08-14 18:55:31 +02:00
Andy Scherzinger
a7859b4ab4 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/drawer.xml
	res/layout/drawer_list_item.xml
	res/values/styles.xml
 2015-08-14 17:45:22 +02:00
Andy Scherzinger
92af92ee3b merged part of the fixes from material buttons branch to fix bugs reported in PR #1076 2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8 fixed drawer font size, changed color according to material guide 2015-08-14 16:00:35 +02:00
Andy Scherzinger
9d08a3f306 fix for drawer width 2015-08-14 15:40:22 +02:00
Andy Scherzinger
abb6e2dbd5 Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices 2015-08-14 15:29:22 +02:00
Andy Scherzinger
607fb6f587 group change data and size together and calculate decimals based on total size see comment in PR #1090 2015-08-14 10:05:26 +02:00
Andy Scherzinger
c86e92870f fixed padding of list items 2015-08-14 00:34:12 +02:00
Andy Scherzinger
927ce968d7 fixed progress wheel 2015-08-13 19:43:56 +02:00
Andy Scherzinger
f17011ff68 some more styling for the log screen 2015-08-13 19:05:20 +02:00
Andy Scherzinger
5b92747895 standard material paddings set 2015-08-13 18:39:53 +02:00
Andy Scherzinger
64910f59bb fixed checkbox (now also material design on pre lollipop) 2015-08-13 18:39:36 +02:00
Andy Scherzinger
8a8eb435a3 set standard 16dp whitespaces via config values not hardcoded 2015-08-13 18:08:21 +02:00
Andy Scherzinger
ba3bc9cbfd minor padding change on logo 2015-08-13 17:54:58 +02:00
Andy Scherzinger
af2af7198b Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
 2015-08-13 15:57:38 +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
Jenkins for ownCloud
a244bdf1ca [tx-robot] updated from transifex 2015-08-13 01:13:38 -04:00
Andy Scherzinger
f7d6939264 fix for text field focus colors 2015-08-12 19:12:56 +02:00
Andy Scherzinger
05ca0270a8 fixed button style blue/grey 2015-08-12 18:54:27 +02:00
Andy Scherzinger
5257af90bc fixed username to be single line and ellipsized in case of lang names 2015-08-12 18:48:33 +02:00
Jenkins for ownCloud
c4b639e964 [tx-robot] updated from transifex 2015-08-12 01:13:37 -04:00
masensio
eda6f71491 Move create folder button to action bar in Uploader 2015-08-11 11:14:26 +02:00
Jenkins for ownCloud
c19bb85a24 [tx-robot] updated from transifex 2015-08-11 01:13:39 -04:00
Andy Scherzinger
6809e4a9de 16dp spacing for the footer too 2015-08-10 18:50:24 +02:00
Andy Scherzinger
e22b547401 further 16dp spacings 2015-08-10 18:36:50 +02:00
Andy Scherzinger
c085ffd545 inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes 2015-08-10 18:32:25 +02:00
Andy Scherzinger
275028a5e3 Merge branch 'master' of https://github.com/owncloud/android into material_toolbar 2015-08-10 13:01:40 +02:00
Andy Scherzinger
6a22a8cd3b Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-08-10 10:54:05 +02:00
Jenkins for ownCloud
2b79f3292f [tx-robot] updated from transifex 2015-08-10 01:13:35 -04:00
Jenkins for ownCloud
2206585f52 [tx-robot] updated from transifex 2015-08-09 01:13:36 -04:00
Jenkins for ownCloud
5258172ffd [tx-robot] updated from transifex 2015-08-08 01:13:38 -04:00
Andy Scherzinger
a3ccc6a559 fix for the button styling (land) 2015-08-07 18:05:50 +02:00
Andy Scherzinger
f4445284d0 material checkbox drawables instead of version dependend ones 2015-08-07 18:05:34 +02:00
Andy Scherzinger
bbfb414695 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-08-07 17:11:04 +02:00
Andy Scherzinger
4a4296a07e Material Buttons (draft) 2015-08-07 17:09:47 +02:00
Jenkins for ownCloud
8d4d1bfffb [tx-robot] updated from transifex 2015-08-07 04:57:36 -04:00
Jenkins for ownCloud
e935e9239d [tx-robot] updated from transifex 2015-08-07 01:13:50 -04:00
Andy Scherzinger
ddd01569cd Optimized translucence for lollipop on image preview 2015-08-06 19:14:52 +02:00
Andy Scherzinger
6b6227125b added back translucent action bar for image preview 2015-08-06 19:04:22 +02:00
Andy Scherzinger
9d9efd1c1d Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 
Conflicts:
	owncloud-android-library
 2015-08-06 17:23:02 +02:00
Andy Scherzinger
a257935b8c Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency 2015-08-06 17:13:00 +02:00
Andy Scherzinger
1ce7d79ff0 Move alert dialog to material variant and setting the correct accent color for the button texts via styles 2015-08-06 16:27:56 +02:00
purigarcia
91000ba405 change the subject 2015-08-06 10:23:27 +02:00
Jenkins for ownCloud
e0594d4005 [tx-robot] updated from transifex 2015-08-06 01:14:11 -04:00
masensio
b694fee63d Merge commit 'refs/pr/707' into text_file_preview_pr_707_with 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-08-05 16:48:12 +02:00
Andy Scherzinger
270fea6a33 fix for the grid footer 2015-08-05 15:21:05 +02:00
Andy Scherzinger
b276b623a9 added bottom padding to logo, logo slightly bigger 2015-08-05 14:48:04 +02:00
Andy Scherzinger
5ded9e818b aligned account name with menu items 2015-08-05 14:07:00 +02:00
Andy Scherzinger
c2418d24d5 added missing progressbar 2015-08-05 13:43:23 +02:00
Andy Scherzinger
97b9932d81 changed color for hint text on login screens to 777 2015-08-05 13:36:12 +02:00
Andy Scherzinger
b5f8c0b087 changed alignment of drawer's content according to jan's suggestions 2015-08-04 19:02:36 +02:00
Andy Scherzinger
e36349f77e fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment 2015-08-04 18:32:33 +02:00
David A. Velasco
156cb5e81b Updated conflict message (same as in web app) 2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578 extracted color values for download fragment, see comments 172c3f56a3 2015-08-04 17:06:27 +02:00
Andy Scherzinger
a329d49ddf Fix for color reference in portrait 8f401a38d8 (comments) 2015-08-04 16:49:20 +02:00
Andy Scherzinger
10c5498879 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:41:53 +02:00
tobiasKaminsky
d2df3f9b33 re-added values-tzl 2015-08-04 12:39:58 +02:00
tobiasKaminsky
c907f6a742 Partially revert 50819ce 2015-08-04 12:39:57 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
Andy Scherzinger
3c78d4fcfb Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 2015-08-04 11:47:44 +02:00
Jenkins for ownCloud
74d5911e56 [tx-robot] updated from transifex 2015-08-04 01:14:04 -04:00
Andy Scherzinger
6235022b56 Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 2015-08-03 21:38:32 +02:00
Jenkins for ownCloud
519ba0393c [tx-robot] updated from transifex 2015-07-31 01:14:01 -04:00
Jenkins for ownCloud
bacebffeb7 [tx-robot] updated from transifex 2015-07-30 01:14:02 -04:00
Jenkins for ownCloud
28284da055 [tx-robot] updated from transifex 2015-07-29 01:14:04 -04:00
Jenkins for ownCloud
2ac67e5e06 [tx-robot] updated from transifex 2015-07-28 01:14:02 -04:00
AndyScherzinger
bfea14e876 setting the username on the drawer header for startup and coming back from the preferences screen for account switching 2015-07-27 20:20:46 +02:00
AndyScherzinger
c49fbfb02c adding a new accent color see #1076 comment by @jancborchardt 2015-07-27 16:34:16 +02:00
AndyScherzinger
687318e549 changing the logo padding top/bottom according to #1076 comment by @jancborchardt 2015-07-27 16:33:36 +02:00
AndyScherzinger
8c0376229e changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076 2015-07-27 16:33:10 +02:00
AndyScherzinger
ff2d55cede replaced hard coded background color with coresponding color-definition 2015-07-27 16:18:53 +02:00
AndyScherzinger
172c3f56a3 colored background black for image download #710 as proposed by @jancborchardt 2015-07-27 01:00:51 +02:00
AndyScherzinger
77457f276f adding material icons to resolutions < xxhdpi 2015-07-26 19:40:31 +02:00
AndyScherzinger
0a3b4c80c2 progress bar drawable definitions (forgot to commit earlier) 2015-07-26 18:36:29 +02:00
AndyScherzinger
e72caebbce fine tuning icon work on login screen, making landscape visually en par with portrait mode 2015-07-26 18:36:00 +02:00
AndyScherzinger
49b3acd2be added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore 2015-07-26 17:52:29 +02:00
AndyScherzinger
0c3e198e77 download fixing for #710 2015-07-26 02:54:03 +02:00
AndyScherzinger
35b971de10 further xxxhdpi cion work 2015-07-26 02:11:15 +02:00
AndyScherzinger
8f401a38d8 redone color changes for login screen 2015-07-26 02:10:51 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
Jenkins for ownCloud
82f4123260 [tx-robot] updated from transifex 2015-07-25 01:13:46 -04:00
Jenkins for ownCloud
3d18b6b207 [tx-robot] updated from transifex 2015-07-24 01:14:12 -04:00
David A. Velasco
c21fa6c6e5 Merge pull request #1050 from owncloud/favourites_context_menu 
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
 2015-07-23 09:37:13 +02:00
Jenkins for ownCloud
650c4fd290 [tx-robot] updated from transifex 2015-07-23 01:13:51 -04: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
Jenkins for ownCloud
1976dfe9a1 [tx-robot] updated from transifex 2015-07-20 01:14:05 -04:00
Jenkins for ownCloud
aab283a15b [tx-robot] updated from transifex 2015-07-18 01:14:06 -04:00
Jenkins for ownCloud
f173670351 [tx-robot] updated from transifex 2015-07-17 01:14:04 -04:00
Jenkins for ownCloud
48cd33ae2d [tx-robot] updated from transifex 2015-07-14 01:14:02 -04:00
Jenkins for ownCloud
05896ff491 [tx-robot] updated from transifex 2015-07-13 01:14:04 -04:00
Jenkins for ownCloud
00e6d45abb [tx-robot] updated from transifex 2015-07-12 01:14:02 -04:00
tobiasKaminsky
9ea3f7794f add missing checker pattern 2015-07-11 09:40:06 +02:00
tobiasKaminsky
0527754c50 add checker background pattern for all png images. 2015-07-11 09:18:26 +02:00
Jenkins for ownCloud
7bb1307a6b [tx-robot] updated from transifex 2015-07-11 01:14:06 -04:00
purigarcia
a3bfcdcd85 Merge branch 'develop' into favourites_context_menu 2015-07-10 08:44:56 +02:00
Jenkins for ownCloud
1e08c40f31 [tx-robot] updated from transifex 2015-07-10 01:14:03 -04:00
Jenkins for ownCloud
d32032fc96 [tx-robot] updated from transifex 2015-07-09 01:14:02 -04:00
purigarcia
7df9aa7310 add unfavorite option in context menu 2015-07-08 08:50:24 +02:00
purigarcia
ebe5a62f73 change the name from favorites to keep_up_to_date 2015-07-08 08:43:49 +02:00
purigarcia
e0efee57b4 add keep up to date option in the menu 2015-07-08 08:36:10 +02:00
Jenkins for ownCloud
7623a8af61 [tx-robot] updated from transifex 2015-07-08 01:14:04 -04:00
masensio
629cff2d3f Merge branch 'master' into develop 2015-07-07 13:15:35 +02:00
masensio
174fa1f36b delete values-tzl 2015-07-07 10:41:22 +02:00
Jenkins for ownCloud
cfe5b84573 [tx-robot] updated from transifex 2015-07-05 01:14:02 -04:00
Jenkins for ownCloud
d762a8747b [tx-robot] updated from transifex 2015-07-03 01:15:16 -04:00
Jenkins for ownCloud
491e8a0bb3 [tx-robot] updated from transifex 2015-07-01 01:14:53 -04:00
Jenkins for ownCloud
eaf860d7c1 [tx-robot] updated from transifex 2015-06-30 01:13:52 -04:00
Jenkins for ownCloud
9ab961aa88 [tx-robot] updated from transifex 2015-06-29 01:13:34 -04:00
Jenkins for ownCloud
93b6c37400 [tx-robot] updated from transifex 2015-06-28 01:13:41 -04:00
Jenkins for ownCloud
24c564ab5f [tx-robot] updated from transifex 2015-06-27 01:13:58 -04:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
Jenkins for ownCloud
b4c217b505 [tx-robot] updated from transifex 2015-06-25 01:13:56 -04:00
Jorge Antonio Diaz-Benito Soriano
9a2f6c6c4b Support margins for API levels pre-17 2015-06-24 22:12:36 +02:00
Jenkins for ownCloud
4aed07aae1 [tx-robot] updated from transifex 2015-06-24 01:13:55 -04:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
36128298d4 Updated file icons with higher resolutions 2015-06-23 14:40:49 +02:00
Jenkins for ownCloud
51a539f4ee [tx-robot] updated from transifex 2015-06-23 01:14:15 -04:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex 
Message with count of list(s) and folder(s) reestructured for better translations
 2015-06-22 14:14:36 +02:00
masensio
2fbd757d66 Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads 
Conflicts:
	owncloud-android-library
 2015-06-22 14:03:21 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition) 
Conflicts FIXED:
	res/values/strings.xml
 2015-06-22 11:42:37 +02:00
Jenkins for ownCloud
a860ff6f96 [tx-robot] updated from transifex 2015-06-22 01:13:55 -04:00
Jenkins for ownCloud
37b2991755 [tx-robot] updated from transifex 2015-06-21 01:13:57 -04:00
Jenkins for ownCloud
f6abd41e09 [tx-robot] updated from transifex 2015-06-20 01:14:01 -04:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
Jenkins for ownCloud
f150ccd21c [tx-robot] updated from transifex 2015-06-19 01:13:55 -04:00
Jenkins for ownCloud
95bdfc0643 [tx-robot] updated from transifex 2015-06-18 01:14:01 -04:00
David A. Velasco
3febfa1e08 Merge pull request #1014 from owncloud/forbidden_characters_from_server 
Delegate check of forbidden characters on server, for OC >= 8.1
 2015-06-17 09:20:27 +02:00
Jenkins for ownCloud
122ee28b85 [tx-robot] updated from transifex 2015-06-17 01:13:57 -04:00
Jenkins for ownCloud
32470c97eb [tx-robot] updated from transifex 2015-06-16 01:14:07 -04:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
 2015-06-15 14:51:13 +02:00
David A. Velasco
66f3a45d05 Merge branch 'develop' into navigationDrawer_basic 
Conflicts FIXED:
	res/layout/files.xml
 2015-06-15 13:43:17 +02:00
Jenkins for ownCloud
42da742d5e [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
Jenkins for ownCloud
f4f0750b1a [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
Jenkins for ownCloud
96f64863d1 [tx-robot] updated from transifex 2015-06-13 01:13:55 -04:00
Jenkins for ownCloud
d094ea108d [tx-robot] updated from transifex 2015-06-12 01:13:56 -04:00
Jenkins for ownCloud
486ad08e79 [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
Jenkins for ownCloud
2075255313 [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
masensio
33fae4d071 Merge pull request #978 from owncloud/automationTest 
Automation test
 2015-06-08 12:53:15 +02:00
Jenkins for ownCloud
d93eb752a1 [tx-robot] updated from transifex 2015-06-08 01:13:49 -04:00
purigarcia
23af1d2310 Merge branch 'develop' into automationTest 2015-06-05 10:32:37 +02:00
Jenkins for ownCloud
e93502657c [tx-robot] updated from transifex 2015-06-05 01:13:53 -04:00
Jenkins for ownCloud
7194818bc0 [tx-robot] updated from transifex 2015-06-04 01:13:55 -04:00
Jenkins for ownCloud
9bf27e63a6 [tx-robot] updated from transifex 2015-06-03 01:13:53 -04:00
masensio
febe1fef89 Add new string message for forbidden characters controlled by the server 2015-06-02 11:07:34 +02:00
Jenkins for ownCloud
ed10941085 [tx-robot] updated from transifex 2015-06-02 01:13:46 -04:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
Jenkins for ownCloud
c74164ecd9 [tx-robot] updated from transifex 2015-05-31 01:13:34 -04:00
Jenkins for ownCloud
b1a99c83f6 [tx-robot] updated from transifex 2015-05-30 01:13:45 -04:00
purigarcia
916bd5c6ca Merge branch 'develop' into automationTest 2015-05-29 14:17:52 +02:00
David A. Velasco
41b5eb13b1 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-05-29 13:46:30 +02:00
David A. Velasco
27148acf16 Fixed style in log-in activity; should be Light, as before 2015-05-29 13:30:02 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
c83925b454 Add license in some files 2015-05-28 11:30:02 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00
Jenkins for ownCloud
a544613d75 [tx-robot] updated from transifex 2015-05-28 01:13:53 -04:00
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +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
e7493203de Merge branch 'develop' into remove_ActionBarSherlock 2015-05-27 13:10:15 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
0238727d13 Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
Jenkins for ownCloud
973aa26b5d [tx-robot] updated from transifex 2015-05-26 01:13:51 -04:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
Jenkins for ownCloud
f22c19a28d [tx-robot] updated from transifex 2015-05-25 01:13:49 -04:00
Jenkins for ownCloud
6e8fab5503 [tx-robot] updated from transifex 2015-05-24 01:13:52 -04:00
Jenkins for ownCloud
9f094c8946 [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
Jenkins for ownCloud
24a6dfda9e [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer 
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2015-05-21 09:46:59 +02:00
Jenkins for ownCloud
07acad20b5 [tx-robot] updated from transifex 2015-05-21 01:13:53 -04:00
masensio
288c148b51 Merge pull request #955 from owncloud/thumbnailOOM 
HOTFIX: prevent OOM when scrolling Thumbnails
 2015-05-20 11:07:14 +02:00
masensio
25718e7992 Merge branch 'develop' into navigation_drawer 2015-05-18 15:04:15 +02:00
David A. Velasco
a3642ab864 Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale 2015-05-18 14:29:00 +02:00
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
Jenkins for ownCloud
2c37b73a55 [tx-robot] updated from transifex 2015-05-18 01:13:50 -04:00
masensio
d43fbbac6b [DEV] Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-15 11:24:14 +02:00
purigarcia
c775fa0691 Merge branch 'develop' into automationTest 2015-05-14 10:18:12 +02:00
Jenkins for ownCloud
efefb3bf2d [tx-robot] updated from transifex 2015-05-14 01:13:58 -04:00
Jenkins for ownCloud
48d356d817 [tx-robot] updated from transifex 2015-05-13 01:13:51 -04:00
purigarcia
2d95a83959 Merge branch 'develop' into automationTest 2015-05-11 08:16:43 +02:00
Jenkins for ownCloud
d8f6448977 [tx-robot] updated from transifex 2015-05-11 01:13:48 -04:00
Jenkins for ownCloud
50c079d646 [tx-robot] updated from transifex 2015-05-10 01:13:53 -04:00
Jenkins for ownCloud
4475dcdf7b [tx-robot] updated from transifex 2015-05-09 01:13:55 -04:00
David A. Velasco
47343ca299 Merge pull request #973 from owncloud/delete_share_option_in_app 
Make share feature configurable
 2015-05-08 14:55:07 +02:00
David A. Velasco
fb6047a72c Rename the flag to show my wish that someday the app will allow to share with other users too 2015-05-08 11:17:39 +02:00
Jenkins for ownCloud
ea62e966fa [tx-robot] updated from transifex 2015-05-08 01:13:55 -04:00
David A. Velasco
94f4a072ed Replaced 'pass code' with 'passcode' 2015-05-07 12:07:44 +02:00
Jenkins for ownCloud
bfde0855c0 [tx-robot] updated from transifex 2015-05-07 01:13:54 -04:00
purigarcia
6a9dfdb330 Merge branch 'develop' into automationTest 2015-05-06 19:05:03 +02:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +02:00
David A. Velasco
8882fb2dbd Merge pull request #967 from owncloud/fix_upload_fails_sending_another_app 
Fixed fail in upload sent from the private storage of other app
 2015-05-05 13:51:46 +02:00
David A. Velasco
dcd8dde864 Merge branch 'develop' into pinEnhancement 2015-05-05 13:43:01 +02:00
David A. Velasco
fdc1216471 Prevent that input fields are maximized in landscape 2015-05-05 12:27:57 +02:00
David A. Velasco
4f0cc76a12 Removed unneeded toggling on cursor visibility 2015-05-05 09:54:49 +02:00
David A. Velasco
510c00f66d Cleaned code in PassCodeActivity 2015-05-05 00:07:24 +02:00
masensio
a41c0b39f2 Add option to turn off share in setup.xml 2015-05-04 14:29:17 +02:00
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
purigarcia
606834980c Merge branch 'develop' into automationTest 2015-05-04 09:10:45 +02:00
Jenkins for ownCloud
3b08f9f5af [tx-robot] updated from transifex 2015-05-04 01:13:48 -04:00
Jenkins for ownCloud
be12aea5ce [tx-robot] updated from transifex 2015-05-02 01:13:50 -04:00
masensio
ce9f67ba14 Merge branch 'develop' into fix_upload_fails_sending_another_app 2015-04-30 13:23:37 +02:00
masensio
7d5c573766 Show Waiting dialog, while copy temporal file async task is working 2015-04-30 13:04:51 +02:00
Jenkins for ownCloud
f2f9fbf264 [tx-robot] updated from transifex 2015-04-30 02:30:10 -04:00
Jenkins for ownCloud
c847e97e31 [tx-robot] updated from transifex 2015-04-29 01:13:49 -04:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	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/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
Jenkins for ownCloud
3489fa1ccb [tx-robot] updated from transifex 2015-04-25 01:13:48 -04:00
Jenkins for ownCloud
25f488cfe1 [tx-robot] updated from transifex 2015-04-24 01:13:45 -04:00
Jenkins for ownCloud
3dc60cd6f7 [tx-robot] updated from transifex 2015-04-23 01:13:49 -04:00
Jenkins for ownCloud
d5ea104e99 [tx-robot] updated from transifex 2015-04-19 01:13:33 -04:00
Jenkins for ownCloud
2f196c54d6 [tx-robot] updated from transifex 2015-04-18 01:13:48 -04:00
Jenkins for ownCloud
65b2da31cc [tx-robot] updated from transifex 2015-04-17 01:13:50 -04:00
purigarcia
68b9744a9c Merge branch 'develop' into automationTest 2015-04-16 09:10:59 +02:00
Jenkins for ownCloud
15512f8d63 [tx-robot] updated from transifex 2015-04-15 01:13:36 -04:00
Jenkins for ownCloud
3fa86ebe5b [tx-robot] updated from transifex 2015-04-10 01:13:49 -04:00
masensio
558a3af1eb Merge branch 'master' into develop 2015-04-09 16:57:09 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
purigarcia
1d613754d6 Merge branch 'develop' into automationTest 2015-04-08 09:49:32 +02:00
Jenkins for ownCloud
ffa503fa76 [tx-robot] updated from transifex 2015-04-06 01:13:38 -04:00
Jenkins for ownCloud
0ba1d7e65d [tx-robot] updated from transifex 2015-04-05 01:13:38 -04:00
Jenkins for ownCloud
bf6e03b0b6 [tx-robot] updated from transifex 2015-04-04 01:13:38 -04:00
Jenkins for ownCloud
8ebf88a31b [tx-robot] updated from transifex 2015-04-03 01:13:39 -04:00
Jenkins for ownCloud
daed811588 [tx-robot] updated from transifex 2015-04-02 01:13:45 -04:00
Jenkins for ownCloud
fc644a03fd [tx-robot] updated from transifex 2015-04-01 01:13:47 -04:00
Jenkins for ownCloud
b6392f7f90 [tx-robot] updated from transifex 2015-03-31 01:13:37 -04:00
Jenkins for ownCloud
7606afa9d6 [tx-robot] updated from transifex 2015-03-29 01:13:47 -04:00
Jenkins for ownCloud
b727c1ef44 [tx-robot] updated from transifex 2015-03-28 01:13:35 -04:00
Jenkins for ownCloud
66159f83f3 [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
purigarcia
d8e954d2d3 add id and contentdescription to a layout 2015-03-25 18:54:10 +01:00
David A. Velasco
6bef4abf74 Merge pull request #924 from owncloud/add_user_agent_support 
Updated after adding custom user agent support to library
 2015-03-25 10:57:04 +01:00
David A. Velasco
30b72638a6 Merge pull request #923 from owncloud/create_folder_during_upload_pr_701_with_develop 
Create folder during upload  (PR#701) and bug fixes
 2015-03-25 09:29:13 +01:00
Jenkins for ownCloud
f1884e807d [tx-robot] updated from transifex 2015-03-25 01:13:49 -04:00
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
898957f9e7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-24 12:26:24 +01:00
Jenkins for ownCloud
d61c021ba4 [tx-robot] updated from transifex 2015-03-24 01:13:40 -04:00
masensio
ae440a5fa7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-23 14:29:25 +01:00
Jenkins for ownCloud
360ffadac0 [tx-robot] updated from transifex 2015-03-23 01:13:36 -04:00
Jenkins for ownCloud
556f846e9c [tx-robot] updated from transifex 2015-03-22 01:13:35 -04:00
Jenkins for ownCloud
2b0e8eddda [tx-robot] updated from transifex 2015-03-21 01:13:36 -04:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
Jenkins for ownCloud
205bd47325 [tx-robot] updated from transifex 2015-03-20 01:13:42 -04:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
Jenkins for ownCloud
1a39af3e95 [tx-robot] updated from transifex 2015-03-19 01:13:50 -04:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
879160bebe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-18 09:20:02 +01:00
Jenkins for ownCloud
4fedf76cb0 [tx-robot] updated from transifex 2015-03-18 01:13:35 -04:00
Jenkins for ownCloud
b7796c99f6 [tx-robot] updated from transifex 2015-03-17 01:13:40 -04:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
Jenkins for ownCloud
3c55631bee [tx-robot] updated from transifex 2015-03-15 01:13:34 -04:00
Jenkins for ownCloud
8b900a6410 [tx-robot] updated from transifex 2015-03-14 01:13:43 -04:00
Jenkins for ownCloud
67ecc0f262 [tx-robot] updated from transifex 2015-03-13 01:13:37 -04:00
Jenkins for ownCloud
311f0bd332 [tx-robot] updated from transifex 2015-03-12 01:13:34 -04:00
Jenkins for ownCloud
3826462073 [tx-robot] updated from transifex 2015-03-11 01:13:43 -04: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
01483a38bf Merge remote-tracking branch 'origin/develop' into share_password_support 2015-03-10 14:27:35 +01:00
Jenkins for ownCloud
5f3175229a [tx-robot] updated from transifex 2015-03-10 01:13:47 -04:00
masensio
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
purigarcia
151c70c443 Merge branch 'develop' into share_password_support 2015-03-09 09:21:38 +01:00
Jenkins for ownCloud
eac3e1ddf1 [tx-robot] updated from transifex 2015-03-09 01:13:33 -04:00
Jenkins for ownCloud
c404060351 [tx-robot] updated from transifex 2015-03-08 01:13:33 -05:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
David A. Velasco
eafaf80dd4 Merge pull request #912 from owncloud/review_license 
Reviewed license text in source files.
 2015-03-06 09:45:56 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
690341af68 Create layout for password 2015-03-05 17:02:40 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
Jenkins for ownCloud
664ee08a3c [tx-robot] updated from transifex 2015-03-05 01:13:45 -05:00
Jenkins for ownCloud
a349906e77 [tx-robot] updated from transifex 2015-03-04 01:13:41 -05:00
Jenkins for ownCloud
3cab8a4986 [tx-robot] updated from transifex 2015-03-03 01:13:33 -05:00
Jenkins for ownCloud
3d66b4ccc0 [tx-robot] updated from transifex 2015-03-01 01:13:35 -05:00
Jenkins for ownCloud
0f3af9c0ef [tx-robot] updated from transifex 2015-02-28 01:13:44 -05:00
Jenkins for ownCloud
c1efe4304b [tx-robot] updated from transifex 2015-02-27 01:13:37 -05:00
Jenkins for ownCloud
62bbe70290 [tx-robot] updated from transifex 2015-02-26 01:13:46 -05:00
Jenkins for ownCloud
72bd1c17a5 [tx-robot] updated from transifex 2015-02-25 01:13:42 -05:00
masensio
759b5e3e72 Merge pull request #888 from owncloud/enable_cookies 
Enable cookies
 2015-02-24 14:05:54 +01:00
Jenkins for ownCloud
4c964b7dcb [tx-robot] updated from transifex 2015-02-24 01:13:38 -05:00
Jenkins for ownCloud
6a88d7a9f4 [tx-robot] updated from transifex 2015-02-22 01:13:32 -05:00
Jenkins for ownCloud
099b32fc42 [tx-robot] updated from transifex 2015-02-21 01:13:31 -05:00
Jenkins for ownCloud
fd8e590ea0 [tx-robot] updated from transifex 2015-02-20 01:13:38 -05:00
masensio
0a03b6d3d4 Merge branch 'develop' into enable_cookies 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2015-02-19 13:02:53 +01:00
David A. Velasco
ec6b9d7c70 Merge branch 'master' into develop 2015-02-19 11:01:00 +01:00
Jenkins for ownCloud
ae1bd1b6a1 [tx-robot] updated from transifex 2015-02-18 01:13:36 -05:00
David A. Velasco
2cfed6eaa7 Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts 2015-02-17 14:00:18 +01:00
Jenkins for ownCloud
7fa529d328 [tx-robot] updated from transifex 2015-02-17 01:13:43 -05:00
Jenkins for ownCloud
effee70675 [tx-robot] updated from transifex 2015-02-15 01:13:29 -05:00
Jenkins for ownCloud
5e1048b343 [tx-robot] updated from transifex 2015-02-14 01:13:32 -05:00
Jenkins for ownCloud
754c277fdd [tx-robot] updated from transifex 2015-02-13 01:13:30 -05:00
Jenkins for ownCloud
f149a9cf77 [tx-robot] updated from transifex 2015-02-12 01:13:31 -05:00
Jenkins for ownCloud
c4110d4be7 [tx-robot] updated from transifex 2015-02-11 01:13:30 -05:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
Jenkins for ownCloud
6162271dff [tx-robot] updated from transifex 2015-02-10 01:13:32 -05:00
Jenkins for ownCloud
62c54ac2ad [tx-robot] updated from transifex 2015-02-09 01:13:30 -05:00
Jenkins for ownCloud
7d8cbde64f [tx-robot] updated from transifex 2015-02-08 01:13:31 -05:00
Jenkins for ownCloud
fa0b91d7fb [tx-robot] updated from transifex 2015-02-07 01:13:34 -05:00
Jenkins for ownCloud
b047882001 [tx-robot] updated from transifex 2015-02-06 01:13:31 -05:00
Jenkins for ownCloud
f8c91b0458 [tx-robot] updated from transifex 2015-02-05 01:13:34 -05:00
Jenkins for ownCloud
8bc75d54b4 [tx-robot] updated from transifex 2015-02-04 01:14:14 -05:00
David A. Velasco
936d8466c6 Updated with fixes in Spanish translation 2015-02-03 14:01:59 +01:00
David A. Velasco
1726a9352a Updated translations after new format string for subject in sharing e-mail 2015-02-03 13:37:22 +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
e4e50d44c4 Corrections from my own comments 2015-02-03 09:52:22 +01:00
David A. Velasco
4af15f7b4e Merge branch 'develop' into imageGrid 2015-02-02 13:48:30 +01:00
Jenkins for ownCloud
8bf624ff8f [tx-robot] updated from transifex 2015-02-01 01:13:30 -05:00
Jenkins for ownCloud
2210ce961a [tx-robot] updated from transifex 2015-01-31 01:13:34 -05:00
masensio
42b5a1e28f Update some icons 2015-01-30 14:37:16 +01:00
masensio
7f6c5bd3b2 Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop 2015-01-30 12:10:15 +01:00
masensio
700318fec0 Update some icons 2015-01-30 11:00:14 +01:00
Jenkins for ownCloud
9d491f71ed [tx-robot] updated from transifex 2015-01-30 01:13:31 -05:00
Jenkins for ownCloud
16b36d0418 [tx-robot] updated from transifex 2015-01-29 01:13:38 -05:00
masensio
d3b0747dde Merge pull request #866 from owncloud/download_folder 
Download a folder
 2015-01-28 09:31:25 +01:00
masensio
0b8f3db914 Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon 2015-01-28 08:59:57 +01:00
Jenkins for ownCloud
da67575522 [tx-robot] updated from transifex 2015-01-28 01:13:45 -05:00
masensio
8ebaba45e7 Show status icons in gridview 2015-01-27 13:51:44 +01:00
masensio
051265620c Add share icons and localFileIndicator to grid_image and grid_item layout 2015-01-27 09:46:19 +01:00
Jenkins for ownCloud
97386bdb87 [tx-robot] updated from transifex 2015-01-26 01:13:30 -05:00
jabarros
7d21a9ec5d Merge pull request #825 from owncloud/SettingsGreyedOut 
Instant Upload settings hide/show
 2015-01-23 09:29:11 +01:00
jabarros
0470de47e0 Fixed. Line behind the folder is not shown in the upload view 2015-01-22 09:29:36 +01:00
jabarros
38ea01dc1e Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/ 2015-01-21 17:51:16 +01:00
jabarros
9b1b5f5e3b Fixed. Footer message should be showed in the list view mode. Also added in grid view mode. 2015-01-21 11:08:15 +01:00
Jenkins for ownCloud
9fcb1612fe [tx-robot] updated from transifex 2015-01-21 01:13:32 -05:00
jabarros
f01156527a Fix. Uploads view is not shown correctly 2015-01-20 14:38:32 +01:00
jabarros
d751df3daa Add Scrollview in list fragment layout for showing text message 2015-01-20 10:43:39 +01:00
jabarros
451783be22 Merge branch 'develop' into imageGrid 2015-01-20 09:56:45 +01:00
jabarros
d0cee8be85 Merge branch 'develop' into SettingsGreyedOut 2015-01-20 09:25:20 +01:00
Jenkins for ownCloud
99276bae85 [tx-robot] updated from transifex 2015-01-20 01:13:34 -05:00
tobiasKaminsky
3c79991b12 Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2 
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	owncloud-android-library
 2015-01-19 22:24:33 +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
e98fc8b141 Merge branch 'develop' into download_folder 2015-01-19 12:49:28 +01:00
Jenkins for ownCloud
880ffab34c [tx-robot] updated from transifex 2015-01-19 01:13:30 -05:00
tobiasKaminsky
6d5c6f86e5 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-18 17:00:29 +01:00
Jenkins for ownCloud
bdb959f2e2 [tx-robot] updated from transifex 2015-01-18 01:13:30 -05:00
Jenkins for ownCloud
46427dad18 [tx-robot] updated from transifex 2015-01-17 01:13:31 -05:00
Jenkins for ownCloud
86f9d43e8a [tx-robot] updated from transifex 2015-01-15 01:13:33 -05:00
Jenkins for ownCloud
369fb6a0be [tx-robot] updated from transifex 2015-01-14 01:13:29 -05:00
Jenkins for ownCloud
f206d8c674 [tx-robot] updated from transifex 2015-01-13 01:13:31 -05:00
jabarros
e9016281bd Add contentDescription tag into main menu items 2015-01-12 13:25:07 +01:00
David A. Velasco
b894a0a4f9 Removed ... from content description 2015-01-12 09:44:00 +01:00
Jenkins for ownCloud
26403abd0a [tx-robot] updated from transifex 2015-01-12 01:13:29 -05:00
Jenkins for ownCloud
acd19c911b [tx-robot] updated from transifex 2015-01-10 01:13:30 -05:00
tobiasKaminsky
d54345d040 Merge remote-tracking branch 'upstream/develop' into uploadNewFolder 
Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-01-08 22:41:41 +01:00
jabarros
3929f1e740 Add content description tag into EditText in account_setup 2015-01-08 13:07:54 +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
Jenkins for ownCloud
f670cfad8f [tx-robot] updated from transifex 2015-01-07 01:13:30 -05:00
Jenkins for ownCloud
464db6b4c5 [tx-robot] updated from transifex 2015-01-06 01:13:30 -05:00
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
Jenkins for ownCloud
ea101df8f5 [tx-robot] updated from transifex 2015-01-05 01:13:29 -05:00
Jenkins for ownCloud
c8dc970121 [tx-robot] updated from transifex 2015-01-04 01:13:31 -05:00
Jenkins for ownCloud
57a840c92e [tx-robot] updated from transifex 2015-01-03 01:13:28 -05:00
Jenkins for ownCloud
c03ea61704 [tx-robot] updated from transifex 2015-01-02 01:13:30 -05:00
tobiasKaminsky
cb725acdf3 - removed whitespaces 
- renamed pin description
 2015-01-01 13:06:25 +01:00
Jenkins for ownCloud
2fb89a9238 [tx-robot] updated from transifex 2015-01-01 01:13:33 -05:00
Jenkins for ownCloud
410bb307e1 [tx-robot] updated from transifex 2014-12-31 01:13:30 -05:00