mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 23:42:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
3395 commits 223 branches 1586 tags 638 MiB
Commit graph

1296 commits

Author SHA1 Message Date
jabarros
5dcc9f8de4 Change order of showing 'shared link' and 'shared with me' icons when both visibles 2014-07-01 09:59:36 +02:00
jabarros
be0990baac Hide 'shared with me' icon when file does not have 'S' permission 2014-07-01 09:59:31 +02:00
jabarros
1e8337fbce Update class FileListAdapter to show new icon for a file and folder that includes 'S' in the permission property. Changed list item layout for showing 'sharedlink' and 'shared with me' icons. 2014-07-01 09:59:30 +02:00
jabarros
fc579b9221 Replace old sharelink icon for new one. Add 'shared with me' new icons 2014-07-01 09:59:29 +02:00
Jenkins for ownCloud
2e6605be8b [tx-robot] updated from transifex 2014-06-30 01:13:36 -04:00
Jenkins for ownCloud
984cc1e31b [tx-robot] updated from transifex 2014-06-29 01:13:33 -04:00
Jenkins for ownCloud
a9ef6b0350 [tx-robot] updated from transifex 2014-06-28 01:13:35 -04:00
Jenkins for ownCloud
3128e5f504 [tx-robot] updated from transifex 2014-06-27 01:13:35 -04:00
David A. Velasco
1958964f56 Added lost string for previous commit 2014-06-26 11:33:51 +02:00
Jenkins for ownCloud
6ac17711c5 [tx-robot] updated from transifex 2014-06-26 01:13:35 -04:00
Jenkins for ownCloud
00937b388d [tx-robot] updated from transifex 2014-06-25 06:30:41 -04:00
David A. Velasco
c266cccb23 Fixed lost pronoun 2014-06-24 14:51:39 +02:00
Jenkins for ownCloud
1e0df5838f [tx-robot] updated from transifex 2014-06-24 01:13:38 -04:00
David A. Velasco
bcfd1f63bd Merge remote-tracking branch 'origin/develop' into develop 2014-06-23 08:49:06 +02:00
David A. Velasco
7c34300268 Improved message 2014-06-23 08:48:42 +02:00
Jenkins for ownCloud
670b22fb69 [tx-robot] updated from transifex 2014-06-22 01:13:33 -04:00
Jenkins for ownCloud
663060241b [tx-robot] updated from transifex 2014-06-21 01:13:36 -04:00
Jenkins for ownCloud
41d75060c1 [tx-robot] updated from transifex 2014-06-19 01:13:33 -04:00
Jenkins for ownCloud
4e8448cb5f [tx-robot] updated from transifex 2014-06-18 01:13:34 -04:00
Jenkins for ownCloud
fd0c35337b [tx-robot] updated from transifex 2014-06-17 01:13:35 -04:00
masensio
f2320691b3 Update branding: instead of specific option, make that using SAML authentication implies enabling the SingleSessionManager. 2014-06-16 13:18:29 +02:00
Jenkins for ownCloud
56404834db [tx-robot] updated from transifex 2014-06-16 01:13:35 -04:00
masensio
1863b75785 Update ic_action_create_dir and ic_action_upload in drawable folders, to show them on actionBar (dark grey --> light gray) 2014-06-13 13:50:18 +02:00
Jenkins for ownCloud
839c7d0bfa [tx-robot] updated from transifex 2014-06-13 01:13:34 -04:00
David A. Velasco
d70e5b37c2 Updated setup file 2014-06-12 09:10:43 +02:00
Jenkins for ownCloud
f108b7dc82 [tx-robot] updated from transifex 2014-06-12 01:13:33 -04:00
Jenkins for ownCloud
2cfdeaccb2 [tx-robot] updated from transifex 2014-06-11 01:13:32 -04:00
Jenkins for ownCloud
0d94e2f199 [tx-robot] updated from transifex 2014-06-09 01:13:33 -04:00
Jenkins for ownCloud
485dab7a25 [tx-robot] updated from transifex 2014-06-07 01:13:33 -04:00
Jenkins for ownCloud
7c2f5e6f64 [tx-robot] updated from transifex 2014-06-06 01:13:33 -04:00
Jenkins for ownCloud
e617a98f29 [tx-robot] updated from transifex 2014-06-05 01:13:35 -04:00
David A. Velasco
edb8c54e3f Merge pull request #526 from owncloud/pull_down_refresh 
Pull down to refresh in list of files.
 2014-06-04 08:46:41 +02:00
Jenkins for ownCloud
18c1b4abfc [tx-robot] updated from transifex 2014-06-04 01:13:35 -04:00
masensio
19978340c1 Merge branch 'develop' into pull_down_refresh 2014-06-03 10:23:47 +02:00
Jenkins for ownCloud
445c3dc9ac [tx-robot] updated from transifex 2014-06-01 06:08:26 -04:00
Jenkins for ownCloud
0325e6a0a2 [tx-robot] updated from transifex 2014-06-01 01:13:34 -04:00
Jenkins for ownCloud
efee32876e [tx-robot] updated from transifex 2014-05-31 01:13:38 -04:00
masensio
ca555b2cd8 Merge branch 'develop' into pull_down_refresh 2014-05-30 14:16:33 +02:00
masensio
abbf2252a3 Maintain the loading visibility on action bar instead of the pull refresh animation 2014-05-30 14:16:08 +02:00
masensio
17c9af3541 Merge branch 'master' into develop 2014-05-30 09:30:05 +02:00
masensio
aa9c09372d Merge branch 'develop' into pull_down_refresh 2014-05-30 08:35:19 +02:00
Jenkins for ownCloud
42f4659609 [tx-robot] updated from transifex 2014-05-30 01:13:36 -04:00
masensio
6451222f8d Select the animation for the SwipeRefreshLayout 2014-05-29 17:07:16 +02:00
masensio
88d855e49c Modify list_fragment.xml, adding SwipePrefreshLayout 2014-05-29 15:51:38 +02:00
Jenkins for ownCloud
902bc3d9cd [tx-robot] updated from transifex 2014-05-29 01:13:34 -04:00
masensio
9fa747d3d1 Update failed_upload_load_more_images string 2014-05-28 17:16:20 +02:00
David A. Velasco
4bb658fe88 Fixed typo in strings 2014-05-28 14:55:18 +02:00
masensio
a3a5cd4eb7 Merge branch 'develop' into release-1.5.6 2014-05-27 13:18:41 +02:00
masensio
476bfba9e4 Update file images, add new mimetypes to show: spreadsheets, impress, rar, rtf and 3gp 2014-05-27 13:16:16 +02:00
masensio
ba1a428964 Modify strings: can not --> cannot, remove space before ? 2014-05-27 09:08:10 +02:00
masensio
bcab40c535 Use ErrorMessageAdapter to access the error string when an error in a finished foreground operation occurs 2014-05-26 14:56:51 +02:00
masensio
db43531874 Add specific message(s) for network error(s) in strings.xml 2014-05-26 13:00:22 +02:00
masensio
f849570b0a Merge branch 'develop' into more_concrete_error_messages_session_expires 2014-05-26 08:52:38 +02:00
Jenkins for ownCloud
f6fec8bfdd [tx-robot] updated from transifex 2014-05-26 01:13:38 -04:00
Jenkins for ownCloud
2546b69f91 [tx-robot] updated from transifex 2014-05-25 01:13:33 -04:00
Jenkins for ownCloud
7848298c38 [tx-robot] updated from transifex 2014-05-24 01:13:34 -04:00
masensio
0a7f748902 Define strings for failes uploads/downloads with credentials errors 2014-05-23 09:40:09 +02:00
Jenkins for ownCloud
600dd05778 [tx-robot] updated from transifex 2014-05-22 01:13:36 -04:00
masensio
57fe5e08fd Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-20 12:16:16 +02:00
Jenkins for ownCloud
50da978c29 [tx-robot] updated from transifex 2014-05-20 01:13:35 -04:00
masensio
c39e851f5e Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-19 08:29:28 +02:00
Jenkins for ownCloud
1c5f333104 [tx-robot] updated from transifex 2014-05-18 01:13:32 -04:00
Jenkins for ownCloud
1d65d58a29 [tx-robot] updated from transifex 2014-05-17 01:13:34 -04:00
David A. Velasco
dfdc713a15 Created new dialog classes for file renaming and folder creations 2014-05-16 14:57:19 +02:00
Jenkins for ownCloud
061b3fc3c0 [tx-robot] updated from transifex 2014-05-16 01:13:34 -04:00
masensio
e373f0c3b1 Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-15 08:52:11 +02:00
Jenkins for ownCloud
ce5701437e [tx-robot] updated from transifex 2014-05-15 01:13:33 -04:00
masensio
491780ad1d Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-14 08:58:04 +02:00
Jenkins for ownCloud
581da955c5 [tx-robot] updated from transifex 2014-05-13 01:14:31 -04:00
masensio
c1eb0ee621 Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-12 12:57:11 +02:00
David A. Velasco
1ced3ca77b Moved 'see details' to the last position of menu 2014-05-12 12:17:57 +02:00
Jenkins for ownCloud
bb3f01b2ed [tx-robot] updated from transifex 2014-05-12 01:14:30 -04:00
Jenkins for ownCloud
a8e5885272 [tx-robot] updated from transifex 2014-05-11 01:14:25 -04:00
Jenkins for ownCloud
78f719d404 [tx-robot] updated from transifex 2014-05-10 01:14:32 -04:00
Jenkins for ownCloud
c8997bd194 [tx-robot] updated from transifex 2014-05-09 01:14:31 -04:00
Jenkins for ownCloud
409c40834d [tx-robot] updated from transifex 2014-05-08 01:14:30 -04:00
Jenkins for ownCloud
e802d7b740 [tx-robot] updated from transifex 2014-05-07 01:14:31 -04:00
Jenkins for ownCloud
20a15a8de2 [tx-robot] updated from transifex 2014-05-04 01:14:33 -04:00
Jenkins for ownCloud
7de62fe300 [tx-robot] updated from transifex 2014-05-03 01:14:34 -04:00
Jenkins for ownCloud
4dbbbea943 [tx-robot] updated from transifex 2014-05-01 01:13:49 -04:00
Jenkins for ownCloud
9dcc5ce524 [tx-robot] updated from transifex 2014-04-30 01:13:45 -04:00
Jenkins for ownCloud
05abbd857f [tx-robot] updated from transifex 2014-04-28 01:13:44 -04:00
Jenkins for ownCloud
3769851ef6 [tx-robot] updated from transifex 2014-04-26 01:13:45 -04:00
Jenkins for ownCloud
c2a523f8d1 [tx-robot] updated from transifex 2014-04-25 01:13:45 -04:00
Jenkins for ownCloud
6c332a15c0 [tx-robot] updated from transifex 2014-04-24 01:13:43 -04:00
Jenkins for ownCloud
1bf039dfbd [tx-robot] updated from transifex 2014-04-23 01:13:48 -04:00
Javier Gonzalez
d60ddd81a0 Merge pull request #149 from owncloud/videoInstandUploads 
Issue #136  [Feature] Instant upload of videos
 2014-04-22 12:47:26 +02:00
Jenkins for ownCloud
f5b6a68b62 [tx-robot] updated from transifex 2014-04-22 01:13:43 -04:00
David A. Velasco
68f4ceb5a7 Separate options to enable & disable instant upload of new pictures and new videos 2014-04-21 10:49:31 +02:00
Jenkins for ownCloud
780c7e89a0 [tx-robot] updated from transifex 2014-04-21 01:14:57 -04:00
Jenkins for ownCloud
cc95c1321b [tx-robot] updated from transifex 2014-04-20 01:14:56 -04:00
David A. Velasco
33b0909e7b Merge branch 'develop' into videoInstandUploads 2014-04-16 19:31:27 +02:00
Mr. Jenkins
97d4975bc5 [tx-robot] updated from transifex 2014-04-16 01:15:02 -04:00
Mr. Jenkins
0004094313 [tx-robot] updated from transifex 2014-04-14 01:14:06 -04:00
Mr. Jenkins
43446e359f [tx-robot] updated from transifex 2014-04-13 01:14:05 -04:00
Mr. Jenkins
53840ec422 [tx-robot] updated from transifex 2014-04-11 01:14:08 -04:00
Mr. Jenkins
ebc4f59abd [tx-robot] updated from transifex 2014-04-10 01:14:08 -04:00
masensio
1a33e4cf65 Merge branch 'develop' into videoInstandUploads 2014-04-09 08:42:30 +02:00
Mr. Jenkins
0e133984d4 [tx-robot] updated from transifex 2014-04-09 01:14:36 -04:00
masensio
3351db6527 Merge branch 'develop' into videoInstandUploads 2014-04-08 12:50:50 +02:00
Mr. Jenkins
69d40e505e [tx-robot] updated from transifex 2014-04-08 04:59:00 -04:00
masensio
119c61dcf4 Merge pull request #458 from owncloud/operations_service 
Operations started by AuthenticatorActivity are run in OperationsService, and end of operations is granted to be dispatched.
 2014-04-08 09:17:47 +02:00
Mr. Jenkins
9cc8efc369 [tx-robot] updated from transifex 2014-04-08 01:15:33 -04:00
masensio
af45cabf35 Merge branch 'develop' into operations_service 2014-04-07 08:49:01 +02:00
Mr. Jenkins
903bf0286e [tx-robot] updated from transifex 2014-04-07 01:15:11 -04:00
Mr. Jenkins
e573a7066e [tx-robot] updated from transifex 2014-04-06 01:15:09 -04:00
Mr. Jenkins
e0d4f3cab7 [tx-robot] updated from transifex 2014-04-05 01:15:10 -04:00
David A. Velasco
7cf05f3647 Internal refactorization of AccountAuthenticatorActivity (and related dependencies) 2014-04-04 14:18:42 +02:00
Mr. Jenkins
a391f987ae [tx-robot] updated from transifex 2014-04-04 01:15:17 -04:00
David A. Velasco
5611205f1d Merge branch 'develop' into operations_service 2014-04-03 11:27:44 +02:00
masensio
bd8e442d3a Merge branch 'develop' into improve_action_bar_pr_392_with_develop 2014-04-03 11:11:13 +02:00
masensio
7a9149a66a Merge pull request #392 from pmarasse/pullup 
Modified actionbar to allow display of icon+text on tablets
 2014-04-03 11:02:54 +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
Mr. Jenkins
9587c90abf [tx-robot] updated from transifex 2014-04-03 01:15:14 -04:00
David A. Velasco
0024569aff AuthenticatorActivity clean up: removed commented code and warnings 2014-04-02 12:46:54 +02:00
masensio
6fead9dd7f Add different action bar configuration for landscape and portrait 2014-04-02 11:19:42 +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
b50072b019 Merge branch 'develop' into improve_action_bar_pr_392_with_develop 2014-04-02 10:45:52 +02:00
Mr. Jenkins
1037fd1b08 [tx-robot] updated from transifex 2014-04-02 01:15:13 -04:00
masensio
5ac1a1ebbb Merge branch 'develop' into operations_service 2014-04-01 14:18:32 +02:00
Mr. Jenkins
8a0f4fc032 [tx-robot] updated from transifex 2014-04-01 01:15:10 -04:00
masensio
f7bc72f21d Replace 'directory' by 'folder' in strings.xml 2014-03-31 10:36:56 +02:00
masensio
5f4b46015f Update string: 'New folder' instead of 'Create directory' 2014-03-31 10:32:49 +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
Mr. Jenkins
c2d4999fa7 [tx-robot] updated from transifex 2014-03-30 01:14:43 -04:00
Mr. Jenkins
b975a0b4f0 [tx-robot] updated from transifex 2014-03-29 01:14:45 -04:00
David A. Velasco
565875d753 AuthenticatorActivity is bound to OperationsService when created 2014-03-28 12:55:07 +01:00
Mr. Jenkins
0f455203a6 [tx-robot] updated from transifex 2014-03-28 01:14:44 -04:00
Mr. Jenkins
ae16937a09 [tx-robot] updated from transifex 2014-03-27 01:14:47 -04:00
masensio
c9a68d67e9 Merge branch 'master' into develop 2014-03-26 12:44:55 +01:00
Mr. Jenkins
b232d15607 [tx-robot] updated from transifex 2014-03-26 01:14:43 -04:00
David A. Velasco
41f86353da Updated notification icon for Android 2.x 2014-03-24 13:17:46 +01:00
masensio
b63fb51226 Update notification icons 2014-03-24 10:46:48 +01:00
David A. Velasco
d2ff7d4755 Merge branch 'develop' into release-1.5.5 2014-03-24 10:23:05 +01:00
masensio
1bda7e1e87 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-24 09:31:43 +01:00
Mr. Jenkins
8a1bcd8159 [tx-robot] updated from transifex 2014-03-24 01:14:32 -04:00
David A. Velasco
a3bf6883fc Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-21 11:02:36 +01:00
masensio
7ed3179100 Merge branch 'develop' into improve_notifications_pr_400_with_develop 2014-03-21 10:37:11 +01:00
masensio
2d6826fe8b Merge pull request #400 from tommyd3mdi/develop 
Notification improvements
 2014-03-21 10:32:49 +01:00
masensio
c6f0847866 Changes from comments in PR#443 2014-03-20 16:15:59 +01:00
David A. Velasco
41614a81c1 Added notification icons with dark background to fix contrast in Android 2.x and 3.x 2014-03-20 14:04:09 +01:00
David A. Velasco
8a9f504138 Fixed contrast of text in notifications for Android 2.x and 3.x 2014-03-20 12:56:44 +01:00
David A. Velasco
604abaf3b4 Grant that progress bar in notifications is shown in Android 2.x and 3.x devices 2014-03-20 10:43:06 +01:00
masensio
b0cfec7a00 Add auth_unsupported_basic_auth string 2014-03-20 09:08:02 +01:00
masensio
09cc36272b Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-20 09:02:29 +01:00
Mr. Jenkins
53fbd428af [tx-robot] updated from transifex 2014-03-20 01:14:32 -04:00
masensio
432d696432 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-19 17:57:56 +01:00
David A. Velasco
f5a9c9600e Merge pull request #441 from owncloud/allow_multiline_checkbox_preferences_pr_395_with_develop 
Allow multiline preferences, not just checkboxes
 2014-03-19 16:59:24 +01:00
David A. Velasco
68482e5f66 Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop 2014-03-19 16:58:10 +01:00
masensio
a9c0d1c62b Update auth_fail_get_user_name string 2014-03-19 10:31:18 +01:00
masensio
71e049394e OC-3390: Shows message about 'not support authentication' under server address 2014-03-19 10:07:56 +01:00
masensio
3e108163bc Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-19 08:55:37 +01:00
Mr. Jenkins
d3980d480f [tx-robot] updated from transifex 2014-03-19 01:14:34 -04:00
masensio
1fff2077a0 OC-3311: Update background color of image preview to black 2014-03-18 14:52:05 +01:00
masensio
b124167f50 Merge pull request #395 from dontcallmedom/master 
allow multi-line checkbox for preferences with long titles
 2014-03-18 14:28:17 +01:00
masensio
3806916a48 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-18 14:21:26 +01:00
masensio
6e86dfb001 OC-3376: 'manage account' field is multiline, in preferences 2014-03-18 13:36:16 +01:00
Mr. Jenkins
ee28694a31 [tx-robot] updated from transifex 2014-03-18 01:14:30 -04:00
Philippe MARASSE
28ef4217e5 updated menu from github comments 2014-03-17 22:15:41 +01:00
masensio
7c19578421 OC-3354: (Fix bug) In the pincode field, it the field doesn't fit, suspension points doesn't appear 2014-03-17 14:04:18 +01:00
masensio
9284d44907 Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop 2014-03-17 13:44:32 +01:00
masensio
92c9049091 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-17 13:40:11 +01:00
masensio
d01e065586 OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method 2014-03-17 13:39:03 +01:00
Mr. Jenkins
1c5754ef51 [tx-robot] updated from transifex 2014-03-15 01:18:34 -04:00
Mr. Jenkins
c7eb56b0f0 [tx-robot] updated from transifex 2014-03-14 01:14:51 -04:00
masensio
9b2e4a6063 Merge branch 'pr/400' into improve_notifications_pr_400_with_develop 2014-03-13 15:49:17 +01:00
masensio
2ab9496b6e Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop 2014-03-13 10:39:22 +01:00
Mr. Jenkins
7f40c50f6a [tx-robot] updated from transifex 2014-03-13 01:14:57 -04:00
masensio
834c98644b Remove some import warnings 2014-03-12 10:53:32 +01:00
David A. Velasco
5338b93604 Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it 2014-03-12 10:32:05 +01:00
masensio
41efad3804 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-12 08:44:56 +01:00
Mr. Jenkins
a4362b2535 [tx-robot] updated from transifex 2014-03-12 01:20:34 -04:00
Thomas Keller
5eccd08bc7 Notification improvements: 
- use NotificationCompat.Builder from the support library and remove the custom progressbar layout; this will give platform users the expected look and feel of a notificati
- remove OCNotificationManager (it contained the old layout references, but was unused)
- add new notification icons that follow the Android style guidelines (http://developer.android.com/design/style/iconography.html#notification)
 2014-03-12 00:08:51 +01:00
masensio
207a52f422 OC-3242: Add new error message for fail in GetUserName. No changes in library reference 2014-03-11 14:43:48 +01:00
masensio
660f97baab Revert "OC-3242: Add new error message for fail in GetUserName" 
This reverts commit 564bbf7bb8.
 2014-03-11 14:40:38 +01:00
masensio
564bbf7bb8 OC-3242: Add new error message for fail in GetUserName 2014-03-11 13:56:41 +01:00
masensio
65d590b8e7 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-11 10:54:10 +01:00
Mr. Jenkins
340fd98c0c [tx-robot] updated from transifex 2014-03-11 01:14:12 -04:00
masensio
101cbbe492 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-10 11:08:42 +01:00
masensio
45bc02fbe5 OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient 2014-03-10 10:53:11 +01:00
Mr. Jenkins
6695b9442e [tx-robot] updated from transifex 2014-03-09 01:14:15 -05:00
Mr. Jenkins
cf91037016 [tx-robot] updated from transifex 2014-03-08 01:14:22 -05:00
masensio
9cac3b60a5 Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview 2014-03-07 15:11:59 +01:00
David A. Velasco
e3be24b472 Fix buttons out of screen in SSL warning dialogs for small screens in landspace 2014-03-07 14:54:04 +01:00
masensio
6944503874 OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one 2014-03-07 14:48:42 +01:00
David A. Velasco
a2be11ad54 Improved view of certificate details for SSL dialog based on SslCertificate 2014-03-07 14:39:30 +01:00
masensio
348c24b7ed Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-07 09:42:23 +01:00
masensio
c86d3cedec Merge branch 'develop' into send_file_pr311_with_develop 2014-03-07 08:53:24 +01:00
Mr. Jenkins
62e62bb062 [tx-robot] updated from transifex 2014-03-07 01:14:59 -05:00
masensio
8e1a2573b9 OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly 2014-03-06 18:26:35 +01:00
Mr. Jenkins
444ec398ba [tx-robot] updated from transifex 2014-03-06 01:14:55 -05:00
Mr. Jenkins
6d8cb3f5e5 [tx-robot] updated from transifex 2014-03-05 01:14:55 -05:00
masensio
56853acff0 Won't Fix: 
Revert "OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file"

This reverts commit df4d0355f2.
 2014-03-04 13:28:07 +01:00
masensio
df4d0355f2 OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file 2014-03-04 11:58:30 +01:00
masensio
c492555b1b Merge branch 'develop' into send_file_pr311_with_develop 2014-03-03 08:46:26 +01:00
Mr. Jenkins
410e4ac373 [tx-robot] updated from transifex 2014-03-02 01:14:29 -05:00
Mr. Jenkins
fc0eea1d59 [tx-robot] updated from transifex 2014-03-01 01:14:31 -05:00
masensio
32ee961d02 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-28 08:30:54 +01:00
Mr. Jenkins
2805dc76d6 [tx-robot] updated from transifex 2014-02-28 01:14:30 -05:00
masensio
ac836eddb7 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-27 08:40:17 +01:00
Mr. Jenkins
0641afc93d [tx-robot] updated from transifex 2014-02-27 01:14:38 -05:00
masensio
54d99ee9f6 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-26 10:15:37 +01:00
Mr. Jenkins
1948d435d7 [tx-robot] updated from transifex 2014-02-26 01:14:35 -05:00
masensio
e183acd650 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-25 11:12:48 +01:00
Mr. Jenkins
e8cb4a594e [tx-robot] updated from transifex 2014-02-25 01:14:46 -05:00
masensio
af1f880b27 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-24 13:33:23 +01:00
masensio
271078a403 Merge branch 'master' into develop 2014-02-24 13:16:57 +01:00
masensio
4852ca8dd4 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-24 13:02:10 +01:00
Mr. Jenkins
d7b3f42664 [tx-robot] updated from transifex 2014-02-22 01:14:58 -05:00
masensio
4172b5824f Merge branch 'develop' into send_file_pr311_with_develop 2014-02-21 09:22:32 +01:00
Mr. Jenkins
1d5087d736 [tx-robot] updated from transifex 2014-02-20 02:29:39 -05:00
David A. Velasco
42fc189367 Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends 2014-02-19 18:00:49 +01:00
Mr. Jenkins
0f2787afeb [tx-robot] updated from transifex 2014-02-19 09:43:23 -05:00
masensio
8db07c67b6 OC-3016: Add option 'send_files_to_other_apps' with default value 'on' 2014-02-19 10:33:27 +01:00
David A. Velasco
0f99af779e Merge branch 'share_link__unshare_file' into release-1.5.4 2014-02-18 11:16:22 +01:00
masensio
c6d4f4980b Merge branch 'develop' into send_file_pr311_with_develop 2014-02-18 10:32:28 +01:00
Mr. Jenkins
c28ab3aec8 [tx-robot] updated from transifex 2014-02-18 04:21:22 -05:00
masensio
6cf78042b0 OC-2968: Filter out ownCloud from the list of apps able to receive the file 2014-02-17 13:54:02 +01:00
masensio
85db28795d OC-2982: Update Settings 2014-02-17 13:11:28 +01:00
masensio
a5db2c2f68 HotFix to add Send File option, after PR#311 2014-02-17 09:16:29 +01:00
masensio
99686805e1 Merge branch 'develop' into send_file_pr311_with_develop 2014-02-17 08:45:52 +01:00
Mr. Jenkins
29318f128d [tx-robot] updated from transifex 2014-02-17 02:25:08 -05:00
Mr. Jenkins
b5f8f72eaa [tx-robot] updated from transifex 2014-02-16 01:20:41 -05:00
Mr. Jenkins
e87fdb87e8 [tx-robot] updated from transifex 2014-02-15 06:19:59 -05:00
masensio
7ead9a0fe4 Merge pull request #311 from tobiasKaminsky/develop 
Added support for sharing files:
 2014-02-14 14:59:24 +01:00
David A. Velasco
fd0b92e9f2 Merge branch 'develop' into release-1.5.4 2014-02-14 14:54:47 +01:00
masensio
7309ea39a6 Merge pull request #401 from owncloud/share_link__unshare_file 
Share link  unshare file
 2014-02-14 14:47:19 +01:00
masensio
42834b213a OC-2966: Change name of the action from 'Share' to 'Send' 2014-02-14 12:38:38 +01:00
masensio
065a9c0046 OC-2966: Change name of the action from 'Share' to 'Send' 2014-02-14 12:13:58 +01:00
masensio
296df1bb65 Merge branch 'pr/311' into pull_request_311_with_develop 2014-02-14 10:59:26 +01:00
Mr. Jenkins
3afa50db27 [tx-robot] updated from transifex 2014-02-14 04:20:44 -05:00
Dominique Hazael-Massieux
59fdac1d26 using longtitle checkboxes 2014-02-13 19:08:26 +01:00
Mr. Jenkins
472169d692 [tx-robot] updated from transifex 2014-02-13 03:06:51 -05:00
Mr. Jenkins
036304a96b [tx-robot] updated from transifex 2014-02-12 01:17:23 -05:00
masensio
c68012235a Merge branch 'develop' into share_link__unshare_file 2014-02-11 10:56:31 +01:00
Mr. Jenkins
34ac94ab4a [tx-robot] updated from transifex 2014-02-11 01:15:14 -05:00
David A. Velasco
28ef1bcf62 Merge branch 'develop' into release-1.5.4 2014-02-10 14:46:26 +01:00
masensio
5462271de8 Merge branch 'develop' into share_link__unshare_file 2014-02-10 13:49:12 +01:00
masensio
659fda0475 Merge branch 'develop' into share_link__unshare_file 2014-02-10 13:48:02 +01:00
Mr. Jenkins
bd58ddb532 [tx-robot] updated from transifex 2014-02-10 06:13:43 -05:00
Mr. Jenkins
2b27144b0c [tx-robot] updated from transifex 2014-02-09 04:17:42 -05:00
Philippe MARASSE
24356ea250 Modified actionbar to allow display of icon+text on tablets 2014-02-08 22:19:54 +01:00
Mr. Jenkins
2d17077936 [tx-robot] updated from transifex 2014-02-08 01:23:03 -05:00
masensio
eb7bbebc08 OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown 2014-02-07 12:54:52 +01:00
masensio
ebbc1793e2 Merge branch 'develop' into share_link__unshare_file 2014-02-07 12:02:38 +01:00
David A. Velasco
cba8baa98d Merge branch 'share_link__new_share' into release-1.5.4 2014-02-07 09:23:40 +01:00
masensio
3662fda2de Merge pull request #388 from owncloud/setup_additions 
Setup additions
 2014-02-06 18:42:33 +01:00
David A. Velasco
62c382b1dc Merge branch 'develop' into share_link__new_share 2014-02-06 15:13:40 +01:00
David A. Velasco
4db5295f56 Merge branch 'share_link__new_share' into setup_additions 2014-02-06 13:58:41 +01:00
David A. Velasco
a9bf3f334d Some high-priority strings needing translation 2014-02-06 13:16:16 +01:00
David A. Velasco
08cec8f7a2 Allow setup of display name in the action bar for root folder 2014-02-05 19:10:08 +01:00
masensio
3f701c5bb8 OC-2834: Access to unshare link from PreviewMediaFragment 2014-02-05 12:52:55 +01:00
masensio
e437d8320d Merge branch 'share_link__new_share' into share_link__unshare_file 2014-02-05 11:25:39 +01:00
masensio
e2af381b88 OC-2823: Show toast message when CreateShareOperation failes 2014-02-05 09:01:46 +01:00
masensio
d770f62ed8 Merge branch 'develop' into share_link__new_share 2014-02-05 08:50:19 +01:00
Mr. Jenkins
3596628da1 [tx-robot] updated from transifex 2014-02-05 01:55:24 -05:00
David A. Velasco
3eb043caf0 Merge branch 'develop' into share_link__new_share 2014-02-04 14:43:36 +01:00
masensio
b6a9e6d6a7 Merge pull request #386 from owncloud/share_link_show_shared_files 
Show 'shared' icon on files shared by the user in the list of files.
 2014-02-04 01:18:00 -08:00
Mr. Jenkins
1b5320094e [tx-robot] updated from transifex 2014-02-04 01:13:58 -05:00
masensio
8d493de0ea OC-2734: Update Database for UnshareLink operation 2014-02-03 14:24:36 +01:00
David A. Velasco
77d22d5a31 Added filtered chooser dialog for activities that can receive a link 2014-02-03 14:24:28 +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
59513cd56d Merge branch 'share_link__new_share' into share_link__new_share_menu 2014-02-03 09:46:26 +01:00
masensio
261d8a5167 OC-2772:Display a message if the user selects to share a file or folder that does not exist on the server 2014-02-03 09:26:36 +01:00
Mr. Jenkins
30663bbc2d [tx-robot] updated from transifex 2014-02-02 01:15:19 -05:00
masensio
0f7d8d8453 OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected 2014-02-01 19:38:36 +01:00
David A. Velasco
fbe5f83aee Adding custom dialog to let the user choose what app should received a shared link [WIP] 2014-01-31 15:38:53 +01:00
Mr. Jenkins
f25faf6c50 [tx-robot] updated from transifex 2014-01-30 01:14:45 -05:00
masensio
7c0accf714 Merge branch 'share_link_show_shared_files' into share_link__code_improvements 2014-01-29 11:14:19 +01:00
masensio
063ec9eff5 Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files 2014-01-29 11:06:48 +01:00
Mr. Jenkins
edd4d07ac0 [tx-robot] updated from transifex 2014-01-29 01:19:51 -05:00
David A. Velasco
c86d4d63cc Merge branch 'share_link_show_shared_files' into share_link__new_share 2014-01-28 10:15:23 +01:00
masensio
0fe14f7457 OC-2490: Update sharelink icon. 2014-01-28 08:55:54 +01:00
Mr. Jenkins
b6a500fc68 [tx-robot] updated from transifex 2014-01-28 02:19:06 -05:00
masensio
388fdd2265 Merge branch 'develop' into share_link_show_shared_files 2014-01-27 14:00:07 +01:00
masensio
af87d2bb52 Merge pull request #360 from owncloud/oc_framework_cleanup_and_documentation 
Oc framework cleaned up and moved out
 2014-01-27 01:14:01 -08:00
Mr. Jenkins
d5d8f3fb22 [tx-robot] updated from transifex 2014-01-27 02:19:06 -05:00
masensio
9d65b66999 OC-2585: Refresh the share items 2014-01-24 15:04:32 +01:00
masensio
a60643a0d0 OC-2700: Modify the layout list_item to show the share icon 2014-01-23 18:33:38 +01:00
Mr. Jenkins
a09ec0eee9 [tx-robot] updated from transifex 2014-01-23 01:14:28 -05: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
David A. Velasco
b8898a8864 Merge remote-tracking branch 'origin/develop' into share_link__new_share 2014-01-22 13:24:40 +01:00
David A. Velasco
8592c315eb Merge branch 'develop' into release-1.5.3 2014-01-22 10:26:19 +01:00
Mr. Jenkins
4f84c74d1f [tx-robot] updated from transifex 2014-01-22 01:14:29 -05:00
David A. Velasco
6d5949b0a2 Added app icon for xhdpi 2014-01-21 14:30:33 +01:00
masensio
2da9af3871 Merge branch 'develop' into share_link_show_shared_files 2014-01-20 11:36:10 +01:00
Mr. Jenkins
69743392f1 [tx-robot] updated from transifex 2014-01-20 01:14:27 -05:00
Mr. Jenkins
6483c8b913 [tx-robot] updated from transifex 2014-01-19 01:14:31 -05:00
Mr. Jenkins
61f53ad160 [tx-robot] updated from transifex 2014-01-18 01:14:30 -05:00
masensio
ae61e2d7d4 OC-2587:Add new string to setup.xml: share_api_link 2014-01-17 14:35:00 +01:00
Mr. Jenkins
2f5806da44 [tx-robot] updated from transifex 2014-01-17 01:14:30 -05:00
Mr. Jenkins
ce5b3e3118 [tx-robot] updated from transifex 2014-01-15 01:56:46 -05:00
Mr. Jenkins
bd5f59d376 [tx-robot] updated from transifex 2014-01-14 01:54:26 -05:00
Mr. Jenkins
09eb142860 [tx-robot] updated from transifex 2014-01-11 01:14:30 -05:00
Mr. Jenkins
03fb21540a [tx-robot] updated from transifex 2014-01-09 01:14:27 -05:00
Mr. Jenkins
0e83e57373 [tx-robot] updated from transifex 2014-01-08 01:14:28 -05:00
Mr. Jenkins
72f6313df8 [tx-robot] updated from transifex 2014-01-07 01:14:46 -05:00
Mr. Jenkins
d9979bc30e [tx-robot] updated from transifex 2014-01-06 01:14:49 -05:00
Mr. Jenkins
18637068f3 [tx-robot] updated from transifex 2014-01-05 01:14:45 -05:00
Mr. Jenkins
ff56f513e2 [tx-robot] updated from transifex 2014-01-02 01:15:03 -05:00
Mr. Jenkins
45593a5cfb [tx-robot] updated from transifex 2013-12-30 01:14:29 -05:00
Mr. Jenkins
39dfccd2d4 [tx-robot] updated from transifex 2013-12-29 01:14:28 -05:00
Mr. Jenkins
d11e4898af [tx-robot] updated from transifex 2013-12-27 01:14:29 -05:00
Mr. Jenkins
8185eb1189 [tx-robot] updated from transifex 2013-12-26 01:14:28 -05:00
Mr. Jenkins
0d7fa8b9d6 [tx-robot] updated from transifex 2013-12-24 01:14:28 -05:00
Mr. Jenkins
e25658837a [tx-robot] updated from transifex 2013-12-22 01:15:05 -05:00
Mr. Jenkins
6effcdc5c3 [tx-robot] updated from transifex 2013-12-21 01:14:58 -05:00
Mr. Jenkins
429837e24b [tx-robot] updated from transifex 2013-12-19 01:14:58 -05:00
Mr. Jenkins
21b2d159ca [tx-robot] updated from transifex 2013-12-17 16:41:14 -05:00
Mr. Jenkins
c2bee9a6f3 [tx-robot] updated from transifex 2013-12-17 05:37:37 -05:00
Mr. Jenkins
45c612fdc9 [tx-robot] updated from transifex 2013-12-13 13:39:24 -05:00
David A. Velasco
ba8ee979d0 Merge branch 'master' into develop 2013-12-12 12:56:36 +01:00
Mr. Jenkins
e250504597 [tx-robot] updated from transifex 2013-12-11 11:38:03 -05:00
David A. Velasco
81e906bc34 Updated hint in URL input field 2013-12-10 13:53:21 +01:00
David A. Velasco
dae42a11b4 Added seasonal icon for winter holidays 2013-12-10 13:41:47 +01:00
Mr. Jenkins
619701c996 [tx-robot] updated from transifex 2013-12-07 21:22:34 -05:00
Mr. Jenkins
1088bbca50 [tx-robot] updated from transifex 2013-12-05 21:19:05 -05:00
Mr. Jenkins
b2711d0763 [tx-robot] updated from transifex 2013-12-04 18:12:58 -05:00
David A. Velasco
34923cf74b Merge branch 'master' into develop 2013-12-04 12:09:22 +01:00
David A. Velasco
96f264f6e1 Fixed layout of login view in landscape to allow change the visibility of welcome link 2013-12-04 09:23:06 +01:00
Mr. Jenkins
34c85bfa8a [tx-robot] updated from transifex 2013-12-02 16:23:01 -05:00
Mr. Jenkins
9972d1ec7b [tx-robot] updated from transifex 2013-11-29 12:18:59 -05:00
Mr. Jenkins
d1bec28271 [tx-robot] updated from transifex 2013-11-27 10:17:13 -05:00
Mr. Jenkins
fce3ae7791 [tx-robot] updated from transifex 2013-11-26 02:19:54 -05: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
Mr. Jenkins
82c1b927d5 [tx-robot] updated from transifex 2013-11-23 23:08:27 -05:00
Mr. Jenkins
59f806f692 [tx-robot] updated from transifex 2013-11-21 19:14:11 -05:00
Mr. Jenkins
a78b7010c0 [tx-robot] updated from transifex 2013-11-21 07:47:41 -05:00
David A. Velasco
e1245bbda7 Merge branch 'develop' into refactor_remote_operation_to_create_folder 2013-11-18 14:10:16 +01:00
David A. Velasco
73849d822d Add check of characters in file name before starting rename/createFolder operations 2013-11-18 14:10:11 +01:00
David A. Velasco
d7559f22a9 Removed obsolete quote 2013-11-18 08:54:29 +01:00
Mr. Jenkins
9431807ec7 [tx-robot] updated from transifex 2013-11-15 21:04:34 -05:00
David A. Velasco
41fe8645c5 New icon app with better contrast 2013-11-15 12:07:03 +01:00
masensio
3ee1c51039 OC-2067: Adapt CreateRemoteFolderOperation, new class FileUtils.java. Try to create folder with invalid characters return an error message 2013-11-14 09:27:34 +01:00
masensio
9fe7d5ba84 Merge pull request #302 from owncloud/remove_automatic_full_syncs 
Removed automatic full syncs and fixed full sync in Android 4.4
 2013-11-11 06:10:39 -08:00
David A. Velasco
cc39a76a90 Reviewed integration with sychronization framework to fix problems in Android 4.4 2013-11-11 10:08:16 +01:00
Mr. Jenkins
c8ee723d99 [tx-robot] updated from transifex 2013-11-11 03:53:32 -05:00
Mr. Jenkins
5b0895a135 [tx-robot] updated from transifex 2013-11-08 23:51:28 -05:00
Mr. Jenkins
628a406a77 [tx-robot] updated from transifex 2013-11-06 20:38:25 -05:00
David A. Velasco
a0efedc99d Merge branch 'develop' into setup_buttons 2013-11-06 11:43:22 +01:00
David A. Velasco
850a3dd09a Let setting up the visibility of the link for new users in the login view 2013-11-06 11:30:15 +01:00
David A. Velasco
d252a09f53 Merge branch 'develop' into setup_buttons 2013-11-06 10:36:34 +01:00
David A. Velasco
fa1d9c4d1f Merge branch 'develop' into review_build_process 2013-11-04 12:39:30 +01:00
David A. Velasco
57de0c0368 Merge branch 'develop' into review_build_process 2013-11-04 12:21:57 +01:00
Mr. Jenkins
4219511665 [tx-robot] updated from transifex 2013-11-04 05:57:20 -05:00
Mr. Jenkins
bcb3f34d47 [tx-robot] updated from transifex 2013-11-03 11:32:25 -05:00
David A. Velasco
797d164184 Merge branch 'develop' into review_build_process 2013-10-31 17:30:38 +01:00
David A. Velasco
7335759b85 Translations updated after clean up of source language in Transifex 2013-10-31 17:26:51 +01:00
masensio
186aeca43b Update images 2013-10-31 17:25:12 +01:00
David A. Velasco
bb34e0f480 Merge branch 'develop' into clean_up 2013-10-31 17:10:09 +01:00
masensio
39688fe30f Remove custom_buttons option from setup.xml. Review account_setup and pincodelock 2013-10-31 16:59:38 +01:00
masensio
20b5ecbac1 Update images. New Styles for Buttons, Dropdown and Progress 2013-10-30 18:37:05 +01:00
masensio
4849affc6f Update image buttons and remove CustomButton class 2013-10-30 17:29:22 +01:00
David A. Velasco
cfa1b1744f Merge branch 'develop' into review_build_process 2013-10-30 13:46:14 +01:00
masensio
920b6f4ecc Update preferences and style 2013-10-30 10:30:48 +01:00
masensio
19e065538b Update setup 2013-10-30 10:24:15 +01:00
masensio
cc10cce87c Update Strings (values-es) 2013-10-30 10:20:41 +01:00
masensio
ebbc8f2ead Update images 2013-10-30 09:08:02 +01:00
Mr. Jenkins
0dbb1876fa [tx-robot] updated from transifex 2013-10-30 01:39:00 -04:00
masensio
e86d7cd9b4 Update setup and strings 2013-10-29 14:36:09 +01:00
masensio
6ace8ab1c1 Update packageName 2013-10-29 14:10:42 +01:00
David A. Velasco
c75e5aa71c Merge branch 'develop' into review_build_process 2013-10-29 13:56:27 +01:00
masensio
ab946b9af6 Adding default images for dropdown and indeterminate_progress in ActionBar 2013-10-29 13:18:49 +01:00
David A. Velasco
a103eb3f96 Included in setup.xml the background color for logo in login view 2013-10-29 11:12:57 +01:00
Mr. Jenkins
dd9da1a1af [tx-robot] updated from transifex 2013-10-29 05:35:45 -04:00
masensio
2c1b67e143 OC-1832: Customize dropdown and spinner in ActionBar 2013-10-29 10:33:30 +01:00
masensio
b3752166e4 OC-1833: New color button_text_color in setup.xml 2013-10-28 13:38:15 +01:00
David A. Velasco
a6807cb93e Merge branch 'develop' into review_build_process 2013-10-28 13:22:06 +01:00
David A. Velasco
c3b2451b37 Fixed replacement markers in Portuguese from Brazil 2013-10-28 13:20:58 +01:00
David A. Velasco
4a038acdd2 Fixed references to old string, now removed 2013-10-28 13:20:24 +01:00
masensio
dd59f5871c OC-1833: Add CustomButton class to can change the background of buttons 2013-10-28 12:58:56 +01:00
Mr. Jenkins
5af4eda38a [tx-robot] updated from transifex 2013-10-28 07:11:55 -04:00
Mr. Jenkins
e0e51f5dbe [tx-robot] updated from transifex 2013-10-28 06:26:38 -04:00
David A. Velasco
4160e7e256 Merge branch 'develop' into clean_up 2013-10-28 10:11:40 +01:00
David A. Velasco
2ce3ed3133 Updated Chinese translation after fixing bug in version string 2013-10-28 10:10:04 +01:00
masensio
6e21c84026 Customize buttons 2013-10-25 15:06:10 +02:00
masensio
de9b09fd3b Update colors 2013-10-25 13:55:15 +02:00
masensio
fc213bc72c Update Images 2013-10-25 13:00:11 +02:00
masensio
3889bea7c9 Update Social Links 2013-10-25 11:09:21 +02:00
masensio
21f491aab4 Update strings 2013-10-25 10:18:34 +02:00
David A. Velasco
56645d9640 Removed urls.xml and moved last URLs to setup.xml 2013-10-25 09:44:26 +02:00
masensio
7656cff3bb Update package name 2013-10-24 18:12:00 +02:00
David A. Velasco
db87c22150 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-23 17:35:07 +02:00
David A. Velasco
505221f597 Removed languages not mantained, including Chinese from Bulgary; really 2013-10-23 16:55:48 +02: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
65adf0a452 Removed unused layout resources 2013-10-23 16:27:28 +02:00
David A. Velasco
4aaf3f25b0 Removed unused drawable resources 2013-10-23 16:22:30 +02:00
David A. Velasco
a9f195a035 Updated translations without unused string resources 2013-10-23 13:17:07 +02:00
David A. Velasco
f88f81e906 Replace 'ownCloud' with reference to app_name 2013-10-23 12:54:49 +02:00
David A. Velasco
d2b61f546d Replace 'ownCloud' with reference to app_name 2013-10-23 12:48:55 +02:00
David A. Velasco
39cc0adf8d Improved messages 2013-10-23 12:18:50 +02:00
David A. Velasco
5d6ba2495a Removed unused code for ownCloud extensions and strings related 2013-10-23 11:15:44 +02:00
David A. Velasco
79aeef21a6 Removed unused code for tracking and related strings 2013-10-23 10:56:24 +02:00
David A. Velasco
fbcd392251 Removed unused landing page and strings related 2013-10-23 10:46:29 +02:00
David A. Velasco
fed7ee2d1a Removed unreferenced string resources 2013-10-23 10:31:17 +02:00
David A. Velasco
f79e2c0430 Merge pull request #284 from owncloud/setup_app_name 
Setup app name, optional settings, and availability of multiple accounts.
 2013-10-22 05:15:21 -07:00
masensio
75d58e44a6 Update data_folder value 2013-10-22 13:24:08 +02:00
masensio
865940064d Merge branch 'contact_settings' into setup_app_name 2013-10-22 13:02:41 +02:00
masensio
01dcdc0672 OC-1797: Imprint is not shown --> FIXED 2013-10-22 13:02:14 +02:00
masensio
aabdaee868 Merge branch 'setup_colors' into setup_app_name 2013-10-22 12:42:57 +02:00
masensio
d4b4dad2a8 OC-1795: Background connect button --> btn_default 2013-10-22 12:42:19 +02:00
masensio
6e0c536490 Merge branch 'setup_colors' into setup_app_name 2013-10-22 11:47:15 +02:00
masensio
47839208d7 OC-1794: Having the device in landscape mode the color is not completely changed --> FIXED 2013-10-22 11:41:36 +02:00
David A. Velasco
9060663f66 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-22 08:26:40 +02:00
masensio
fc5608de76 Merge branch 'setup_colors' into setup_app_name 2013-10-18 15:00:16 +02:00
masensio
a1f8d76188 OC-1769: Modify background_color and login_background_color works fine 2013-10-18 14:59:42 +02:00
masensio
b66e309dfa Merge branch 'contact_settings' into setup_app_name 
Conflicts:
	res/values/setup.xml
 2013-10-18 12:42:00 +02:00
masensio
31f6e61f89 Merge branch 'setup_multiaccount' into setup_app_name 
Conflicts:
	res/values/setup.xml
	src/com/owncloud/android/authentication/AccountAuthenticator.java
 2013-10-18 12:32:22 +02:00
masensio
ea7f8fe491 Merge branch 'setup_colors' into setup_app_name 2013-10-18 12:24:29 +02:00
masensio
bf21e3f026 update strings to transifex 2013-10-18 12:17:37 +02:00
masensio
91e50a97a5 Merge branch 'transifex' into setup_app_name 
Conflicts:
	res/values-ko/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-tr/strings.xml
 2013-10-17 18:20:38 +02:00
masensio
dc70f9e890 Update transifex strings 2013-10-17 18:07:13 +02:00
masensio
7488345470 OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00
masensio
5b8a5718cf OC-1662: app_name to setup.xml 2013-10-16 09:37:28 +02:00
masensio
9681b8687e OC-1656: Disable/enable help-imprint-feedback options 2013-10-16 08:56:41 +02:00
masensio
066cd5aab3 Merge branch 'develop' into contact_settings 
Conflicts:
	res/values/strings.xml
 2013-10-15 14:07:59 +02:00
masensio
e4eabcb502 OC-1730: Update Images 2013-10-15 13:26:20 +02:00
masensio
152ab88d90 OC-1668: Block creation of account from device settings 2013-10-15 11:32:46 +02:00
masensio
9fcc118b8a 0C-1647: Enable/Disable Create Account option 2013-10-14 13:39:22 +02:00
masensio
76ed9aa72e OC-1646: Adding multiaccount_support property 2013-10-14 12:55:21 +02:00
masensio
1809997dc1 OC-1671: ActionBar Color 2013-10-11 15:14:41 +02:00
masensio
b78eb416a4 OC-1670: owncloud_white --> background_color 2013-10-11 15:08:32 +02:00
David A. Velasco
79493448d9 Included name of the 'lost' folder in the toast warning about current folder removed in the server 2013-10-08 11:24:15 +02:00
masensio
72e54bf983 OC-1591: Update Error Message 2013-10-07 10:51:52 +02:00
David A. Velasco
86f7f0cc3c Fixed units in media control view 2013-10-02 18:19:20 +02:00
David A. Velasco
74370d5dee Exit the current folder when not existing in the server any more (2) 2013-10-02 18:08:01 +02:00
David A. Velasco
ab3bcf6fe6 Exit the current folder when not existing in the server any more 2013-10-02 16:52:36 +02:00
masensio
b9c7b92940 OC-1129: Add LoadingDialog.java 2013-09-18 18:13:24 +02:00
masensio
63a2392cf0 OC-1128: Create new layout for loading dialog 2013-09-10 10:45:00 +02:00
masensio
52500fac9a Set SSO flag to OFF 2013-08-27 14:58:56 +02:00
masensio
5066193e58 Merge branch 'master' into saml_based_federated_single_sign_on_expired 2013-08-26 10:20:59 +02:00
Jenkins for ownCloud
112cc0f80c [tx-robot] updated from transifex 2013-08-23 19:12:48 -04:00
David A. Velasco
dc02769e49 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-23 14:37:14 +02:00
David A. Velasco
ea5cd96679 Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on 2013-08-23 14:32:03 +02:00
David A. Velasco
2b1b98478b Added handler to trigger server check when the background is touched in login view for SSO login 2013-08-23 14:31:17 +02:00
masensio
71347b48a0 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 
Conflicts:
	src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
 2013-08-23 13:42:07 +02:00
masensio
92c4528bdf Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on 2013-08-23 09:11:42 +02:00
masensio
913a74d9f8 Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on 2013-08-23 09:09:40 +02:00
David A. Velasco
b2f18e0f12 Avoid that a user can recover an expirated SAML session with a different userid than the used to create it 2013-08-22 19:03:21 +02:00
David A. Velasco
316a0a12ad Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-22 17:50:11 +02:00
David A. Velasco
d7c6472bd3 Added check to avoid the creation of the same account (same oc_username in the same server) more than once 2013-08-22 17:38:26 +02:00
masensio
dea37f653c Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 
Conflicts:
	res/values-es/strings.xml
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
 2013-08-22 12:59:56 +02:00
David A. Velasco
37297fb7a9 Fixed orientation changes in SSO dialog with WebView 2013-08-21 18:51:13 +02:00
Jenkins for ownCloud
20afb728fe [tx-robot] updated from transifex 2013-08-21 07:08:27 -04:00
Jenkins for ownCloud
05eac46979 [tx-robot] updated from transifex 2013-08-19 14:03:43 -04:00
masensio
62e72ab303 Update string: auth_expired_saml_sso_token_toast 2013-08-18 17:32:32 +02:00
masensio
3f9774994c update strings.xml 2013-08-17 19:02:43 +02:00
masensio
2d36f5a564 message 'Session expires' in TextView instead of Toast 2013-08-17 18:39:05 +02:00
David A. Velasco
54679a521d Merge branch 'develop' into sso_bug_changing_orientation 2013-08-17 10:52:03 +02:00
Jenkins for ownCloud
ca98430f90 [tx-robot] updated from transifex 2013-08-15 16:57:14 -04:00
masensio
b458c92be0 Update server-url 2013-08-14 09:15:47 +02:00
masensio
1cb6b12869 Update server-url 2013-08-14 09:10:31 +02:00
Jenkins for ownCloud
5ee605ead5 [tx-robot] updated from transifex 2013-08-13 08:08:53 -04:00
masensio
9dacdbec0b Move WebView to Dialog 2013-08-13 12:08:46 +02:00
David A. Velasco
68df3cbfe7 Expiration of SSO session is detected in background operations (download, upload, sync account) and error notification lets the user access to the login view 2013-08-12 11:34:09 +02:00
Jenkins for ownCloud
56cf5d5467 [tx-robot] updated from transifex 2013-08-09 06:57:46 -04:00
David A. Velasco
78bcf72188 Foreground operations on files (remove, rename, new folder) failed due to SAML SSO session expired redirect the app to the login view for a new authentication 2013-08-07 19:13:00 +02:00
Jenkins for ownCloud
c66121a9e0 [tx-robot] updated from transifex 2013-08-07 07:58:05 -04:00
Jenkins for ownCloud
3420444dff [tx-robot] updated from transifex 2013-08-03 01:14:29 -04:00
David A. Velasco
5ede3e9909 Improved status messages for authentication through SAML-based federated SSO 2013-08-01 17:44:23 +02:00
Jenkins for ownCloud
938e091dd8 [tx-robot] updated from transifex 2013-08-01 01:15:28 -04:00
Jenkins for ownCloud
c4b842f8ac [tx-robot] updated from transifex 2013-07-31 01:15:26 -04:00
David A. Velasco
d2ee9062fa Configured embedded WebView to allow the single-sign-on process is completed and to catch the cookie setting the authorized session 2013-07-30 13:02:13 +02:00
Jenkins for ownCloud
4d167731ea [tx-robot] updated from transifex 2013-07-30 01:14:15 -04:00
Jenkins for ownCloud
2ae677d7b3 [tx-robot] updated from transifex 2013-07-28 01:15:01 -04:00
Jenkins for ownCloud
cf18fbfad2 [tx-robot] updated from transifex 2013-07-27 01:15:00 -04:00
David A. Velasco
5a65ff53c2 AuthenticatorActivity updated to test existance through SAML-based-federated-authenticated entry point 2013-07-26 13:05:01 +02:00
David A. Velasco
0713ba613d Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration 2013-07-25 17:29:52 +02:00
Jenkins for ownCloud
c4bf28b2c6 [tx-robot] updated from transifex 2013-07-22 01:19:06 -04:00
Jenkins for ownCloud
648ac49687 [tx-robot] updated from transifex 2013-07-20 01:20:01 -04:00
Jenkins for ownCloud
e2cd4e4d3d [tx-robot] updated from transifex 2013-07-19 01:20:04 -04:00
Jenkins for ownCloud
b87ba76545 [tx-robot] updated from transifex 2013-07-18 01:24:50 -04:00
Jenkins for ownCloud
3ef6bce0c6 [tx-robot] updated from transifex 2013-07-17 02:14:46 -04:00
masensio
c7188eb833 Merge branch 'master' into release-1.4.2 2013-07-16 09:05:34 +02:00
Jenkins for ownCloud
e3a1fb510d [tx-robot] updated from transifex 2013-07-15 17:07:21 -04:00
Jenkins for ownCloud
e33c118195 [tx-robot] updated from transifex 2013-07-14 01:14:27 +02:00
Jenkins for ownCloud
84c82f8a9e [tx-robot] updated from transifex 2013-07-12 01:15:20 +02:00
Jenkins for ownCloud
83a9874d40 [tx-robot] updated from transifex 2013-07-11 01:21:57 +02:00
masensio
b4a85deafc Merge pull request #215 from owncloud/branding_configurable_URL_input_field 
Configurable url input field
 2013-07-10 00:24:16 -07:00
David A. Velasco
133e89d495 Merge branch 'master' into develop 2013-07-10 09:06:08 +02:00
Jenkins for ownCloud
81ef2eaaea [tx-robot] updated from transifex 2013-07-10 01:34:04 +02:00
David A. Velasco
c593c1ecb9 Fixed default value of parameters for URL-input visibility 2013-07-09 10:19:47 +02:00
David A. Velasco
86a97a605a Fixed alignment of embedded refresh button and url input field in landscape too 2013-07-09 10:19:08 +02:00
David A. Velasco
912d867f27 Fixed alignment of embedded refresh button and url input field 2013-07-09 09:50:55 +02:00
Jenkins for ownCloud
c612cb6036 [tx-robot] updated from transifex 2013-07-09 01:15:36 +02:00
Jenkins for ownCloud
110a64efa8 [tx-robot] updated from transifex 2013-07-08 01:15:20 +02:00
Jenkins for ownCloud
e391b28590 [tx-robot] updated from transifex 2013-07-07 01:20:10 +02:00
Jenkins for ownCloud
3338f27d2a [tx-robot] updated from transifex 2013-07-06 01:14:54 +02:00
David A. Velasco
233533faa3 Merge branch 'develop' into branding_configurable_URL_input_field 2013-07-05 11:52:24 +02:00
David A. Velasco
12bffce50c Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings 2013-07-05 10:47:34 +02:00
David A. Velasco
04c2311131 Merge branch 'master' into develop 2013-07-05 09:22:52 +02:00
Jenkins for ownCloud
110e7647f8 [tx-robot] updated from transifex 2013-07-05 01:21:39 +02:00
Jenkins for ownCloud
ace5d49f30 [tx-robot] updated from transifex 2013-07-04 09:39:17 +02:00
David A. Velasco
dcbc08cae7 Merge branch 'develop' into check_account_existance_in_gallery 2013-07-03 10:06:37 +02:00
Jenkins for ownCloud
0f76b038ca [tx-robot] updated from transifex 2013-07-02 15:40:13 +02:00
David A. Velasco
e8239f434a Merge branch 'develop' into modify_password 2013-07-02 13:08:27 +02:00
David A. Velasco
5b792b0440 Merge branch 'develop' into check_account_existance_in_gallery 2013-06-28 11:58:43 +02:00
Jenkins for ownCloud
f9df07c152 [tx-robot] updated from transifex 2013-06-28 01:23:35 +02:00
Jenkins for ownCloud
e02ad6c038 [tx-robot] updated from transifex 2013-06-27 01:38:29 +02:00
masensio
b52f0484b4 OC-461: Add check server button. OC-394 2013-06-26 18:50:08 +02:00
David A. Velasco
a957efbd3d Merge remote-tracking branch 'origin/master' 2013-06-26 18:11:29 +02:00
David A. Velasco
5781090e2b Merge branch 'release-1.4.1' 2013-06-26 18:10:10 +02:00
David A. Velasco
0f2a7475b1 Disabled logging options until fixed 2013-06-26 09:13:28 +02:00
Jenkins for ownCloud
4d1f8d7dc1 [tx-robot] updated from transifex 2013-06-26 01:18:51 +02:00
masensio
dcc0461a7d OC-459:new string server_url, new bool show_server_url_input. OC-394 2013-06-25 11:00:19 +02:00
masensio
6436606c1c OC-458: new branding.xml. OC-394 2013-06-25 10:19:19 +02:00
Jenkins for ownCloud
ef47fcb9cd [tx-robot] updated from transifex 2013-06-25 01:25:09 +02:00
David A. Velasco
7c1be6db3e Updated some messages in login activity 2013-06-24 10:59:11 +02:00
David A. Velasco
d51372fb92 Make the 'refresh' button enabled when visible, although the URL-input field is disabled, when the password is being updated 2013-06-24 10:39:52 +02:00
Jenkins for ownCloud
3c00f08041 [tx-robot] updated from transifex 2013-06-24 01:30:18 +02:00
Jenkins for ownCloud
52879c3be8 [tx-robot] updated from transifex 2013-06-22 01:42:24 +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
Jenkins for ownCloud
8f2c041687 [tx-robot] updated from transifex 2013-06-21 08:37:31 +02:00
Jenkins for ownCloud
b7d491ef97 [tx-robot] updated from transifex 2013-06-20 01:20:28 +02:00
David A. Velasco
63a3522ab7 Merge branch 'develop'after SPRINT-002 
Conflicts:
	.classpath
 2013-06-19 17:56:46 +02:00
David A. Velasco
d612f37de4 'Refresh' options in menus differentiated: 'refresh file' and 'refresh account' 2013-06-18 15:04:45 +02:00
Jenkins for ownCloud
9d24b7ca53 [tx-robot] updated from transifex 2013-06-18 01:38:06 +02:00
Jenkins for ownCloud
23ddf7aec2 [tx-robot] updated from transifex 2013-06-16 01:35:15 +02:00
Jenkins for ownCloud
a3bcaeb3b5 [tx-robot] updated from transifex 2013-06-15 01:35:24 +02:00
David A. Velasco
3ecabe3ea7 PreviewVideoActivity protected against access to non-exiting account 2013-06-14 16:59:38 +02:00
Jenkins for ownCloud
5882a655c6 [tx-robot] updated from transifex 2013-06-14 02:17:56 +02:00
Jenkins for ownCloud
6d2deaa2dc [tx-robot] updated from transifex 2013-06-13 01:37:58 +02:00
Jenkins for ownCloud
95575d0a14 [tx-robot] updated from transifex 2013-06-12 18:02:10 +02:00
David A. Velasco
02d08d0f81 Merge branch 'develop' into direct_download_with_click_at_list 2013-06-12 11:47:18 +02:00
David A. Velasco
8dfd6955a4 Merge remote-tracking branch 'origin/master' 2013-06-12 09:40:06 +02:00
David A. Velasco
2a96c27e3a Fixed bad replace tokens 2013-06-12 09:37:08 +02:00
David A. Velasco
5bd3fd6273 Fixed bad replace tokens and removed unnecessary quote 2013-06-12 09:36:38 +02:00
Jenkins for ownCloud
3791d39ab2 [tx-robot] updated from transifex 2013-06-12 02:15:52 +02:00
Jenkins for ownCloud
b8497334fa [tx-robot] updated from transifex 2013-06-11 01:38:57 +02:00
Jenkins for ownCloud
cb9d10d24b [tx-robot] updated from transifex 2013-06-10 01:33:05 +02:00
Jenkins for ownCloud
0cb5c5df78 [tx-robot] updated from transifex 2013-06-08 01:29:21 +02:00
Jenkins for ownCloud
c372145296 [tx-robot] updated from transifex 2013-06-07 13:23:32 +02:00
Jenkins for ownCloud
2f27206360 [tx-robot] updated from transifex 2013-06-07 01:36:11 +02:00
Thomas Mueller
c4d695af1c remove invalid language code 2013-06-07 00:41:43 +02:00
Jenkins for ownCloud
87336fa48e [tx-robot] updated from transifex 2013-06-06 01:48:30 +02:00
Jenkins for ownCloud
6865109f53 [tx-robot] updated from transifex 2013-06-05 16:22:26 +02:00
Jenkins for ownCloud
408fca9055 [tx-robot] updated from transifex 2013-06-05 14:12:03 +02:00
Jenkins for ownCloud
a4c0440243 [tx-robot] updated from transifex 2013-06-05 14:11:50 +02:00
David A. Velasco
93f79c7099 Cancel button for downloads in progress replaceed with 'x' icon 2013-06-05 11:08:33 +02:00
David A. Velasco
c70f333358 REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity 2013-06-04 14:30:29 +02:00
masensio
9dc5a62e44 OC-247: Resize active area for the eye icon 2013-06-04 10:45:24 +02:00
David A. Velasco
fd39628997 REFACTORING: FileDetailActivity never more - simplifies transitions and removes bugs in orientation changes 2013-05-30 17:53:21 +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
0e133233f3 Placeholder drawable for 'hide password' button replace with the final icon 2013-05-24 12:47:39 +02:00
David A. Velasco
7160a49e20 Merge branch 'develop' into login_toggle_password_icon 2013-05-24 10:36:21 +02:00
David A. Velasco
5a488a8ada Fixed look of disabled connect button in portrait, no more drawn as enabled 2013-05-21 13:49:42 +02:00
David A. Velasco
ac32e8411a Fixed alignment of login fields in Androd 3.x devices 2013-05-20 13:22:17 +02:00
David A. Velasco
69b527c39d Visibility icon in password field is toggled according to the visibility state; better touch detection of visibility and refresh buttons 2013-05-17 14:33:31 +02:00
David A. Velasco
8bc9a0c86d Fixed scroll view in landscape: full content is scrollable when software keyboard is shown 2013-05-16 19:43:10 +02:00