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
David A. Velasco
b8fbf38c56
Fixed form gravity in login view, in landscape
2013-05-15 17:21:43 +02:00
David A. Velasco
4f524a2043
Grant that 'refresh' button embedded in the URL input field does not hide the text in the field
2013-05-14 15:19:43 +02:00
David A. Velasco
3eb602f81a
Fixed unlinked refresh button for the server connection check
2013-05-14 13:39:09 +02:00
David A. Velasco
d7c7ccd99b
Added scroll to login view in landscape
2013-05-14 11:20:48 +02:00
David A. Velasco
00166fe5a8
Better position for scroll bar in portrait login view
2013-05-14 11:06:18 +02:00
David A. Velasco
50d77e8dc8
Review of login view layout optimizing the adaption to different screen sizes
2013-05-10 16:35:01 +02:00
David A. Velasco
b36914df88
Merge branch 'develop' into file_browsing_refactoring
...
Conflicts:
AndroidManifest.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2013-05-06 10:48:43 +02:00
David A. Velasco
1ee5b70d94
Generic values for Oauth 2 configuration
2013-05-03 13:30:35 +02:00
David A. Velasco
a95456884c
Fixed bugs after merge
2013-05-03 10:34:25 +02:00
David A. Velasco
9b4da8439a
Merge branch 'develop' into oauth_login
...
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
2013-05-03 10:24:20 +02:00
zerginator
b4eed72943
deleted cancel button
2013-05-01 21:37:52 +02:00
zerginator
2acbe9455d
Issue #56 + Issue #14 + Issue #143
2013-05-01 21:34:13 +02:00
zerginator
536cc166b6
Issue #136 [Feature] Instant upload of videos
2013-05-01 20:06:13 +02:00
David A. Velasco
2946d8dd69
Merge branch 'develop' into oauth_login
...
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/authentication/AccountAuthenticator.java
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/network/OwnCloudClientUtils.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/eu/alefzero/webdav/WebdavClient.java
2013-04-25 19:39:22 +02:00
David A. Velasco
803568ab27
Moved buttons in details view to options/action menu
2013-04-22 14:34:42 +02:00
David A. Velasco
bdc0332c23
Copyright note fixes
2013-04-17 12:26:13 +02:00
David A. Velasco
be51b2c4aa
Fixed regression after merge: removed 'about' entry in menu
2013-04-15 13:48:04 +02:00
David A. Velasco
7052e3b5b8
About in settings, more i18n-friendly
2013-04-15 13:45:20 +02:00
David A. Velasco
c3ca5b5a4f
Merge branch 'develop' into loggingtool
...
Conflicts:
AndroidManifest.xml
res/menu/main_menu.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDetailActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
src/eu/alefzero/webdav/FileRequestEntity.java
src/eu/alefzero/webdav/WebdavClient.java
2013-04-15 13:12:04 +02:00
David A. Velasco
053aad5ae1
Merge branch 'bug_hunting' into feature_previews
...
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:49:04 +02:00
David A. Velasco
77ddd1ccb6
Merge branch 'develop' into feature_previews
...
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:44:30 +02:00
zerginator
5a22c7e79f
Cleaned stuff , add a history delete button and renamed
...
Log2EmailActivity in LogHistoryActivity
2013-04-01 10:26:40 +02:00
David A. Velasco
97ae9007e4
Fixed hardcoded string in UploaderActivity layout; and German translations
2013-03-27 17:19:19 +01:00
David A. Velasco
2e5b40e357
Make the OAuth authorization available or not depending upon a variable in oauth.xml
2013-03-27 13:39:00 +01:00
David A. Velasco
980b31de2e
Allow edition of OAuth endpoints for testing; better configuration values
2013-03-22 14:50:30 +01:00
David A. Velasco
cd45a90bac
Fixed typo
2013-03-21 14:00:46 +01:00
David A. Velasco
237a326598
Added German translation for media and preview text strings
2013-03-21 13:52:56 +01:00
David A. Velasco
69d6d821ec
OAuth clean-up and refactoring
2013-03-21 12:21:48 +01:00
David A. Velasco
5665d9c306
Merge tag 'oc-android-1-3-22' into oauth_login
...
Conflicts:
AndroidManifest.xml
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
2013-03-18 14:28:49 +01:00
David A. Velasco
7d84fd0c9f
Refresh authorization token on failed synchronizations when notification error is clicked
2013-03-18 14:05:34 +01:00
Matthias Baumann
6c5f561342
- exclude none InstantUpload from InstantUploadActivity
...
- add simple Activity for none InstantUloads to show the whole
error-message
2013-03-17 10:38:42 +01:00
Matthias Baumann
7392cfe5ab
- InstantUpload path const not longer at two places, only at
...
InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially for QUOTA_EXCEEDED is it necessary to show that to
the user
2013-03-16 18:56:27 +01:00
David A. Velasco
99a35347a7
Fixed horizontal layout - media controller totally visible
2013-03-13 10:59:55 +01:00
David A. Velasco
dc08386401
Merge branch 'details' into feature_previews
2013-03-12 13:03:15 +01:00
David A. Velasco
1493579a2e
Changed 'See details' option menu for 'Details'
2013-03-12 13:02:51 +01:00
zerginator
8e36e7cc3e
This wraps the android.util.logging into Log_OC which , if its enabled
...
in the app, logs the logcat into a file. It also includes the phone
information (MODEL, VERSION...)
https://github.com/owncloud/android/issues/97
2013-03-12 07:56:27 +01:00
David A. Velasco
fc134b1928
Updated translation files
2013-03-11 13:54:23 +01:00
David A. Velasco
7d67737a4f
Updating translation files...
2013-03-11 13:27:56 +01:00
David A. Velasco
ca8a19850b
Improving our own media control: removed 'next' and 'previous' buttons, removed undesired 'show' and 'hide' behaviour, fixed update of progress bar, recovered BACK button
2013-03-11 10:20:04 +01:00
zerginator
18a715072c
moved About App into preferences
...
https://github.com/owncloud/android/issues/57
2013-03-10 20:38:46 +01:00
David A. Velasco
d68b324653
Create our own media control - basic operation
2013-03-08 13:32:10 +01:00
David A. Velasco
5f8b636288
Fixed some more CRASHES due to format fails in Ukranian translation (fixed in Transifex too)
2013-03-07 13:45:55 +01:00
David A. Velasco
5c37e0c10e
Fixed CRASH when a download is successfull completed with device in Ukranian
2013-03-07 12:45:01 +01:00
David A. Velasco
db7eea712d
Improved message for failed downloads in gallery
2013-03-01 14:20:25 +01:00
David A. Velasco
427a3e6331
Progress wheel shown in gallery while an image is getting loaded
2013-03-01 10:49:35 +01:00
David A. Velasco
6cfa24f55a
Improved error messages in gallery for images that can not be loaded
2013-03-01 09:54:49 +01:00
David A. Velasco
638b7767cb
Gallery in full screen, action bar shown on tap
2013-02-28 17:09:00 +01:00
David A. Velasco
becf52226e
Improved layout for downloads in image gallery
2013-02-26 14:01:32 +01:00
David A. Velasco
cb66b59918
Minimize new fragment to monitor the progress of file download
2013-02-25 15:19:18 +01:00
David A. Velasco
d7e0519294
Added view pager for scrolling image previews with horizontal swipe
2013-02-25 14:33:16 +01:00
David A. Velasco
3d272eb753
Force preview of images in 'full screen'
2013-02-25 12:24:14 +01:00
Matthias Baumann
f764980474
- extend existing FileUpload, so we can handel failed instand upload
...
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
-touch to the 'Faild Upload Notifivation'
-submenue underneath the upload menue
- merges from head
- add lazy loading for the images list with failed uploads
2013-02-25 08:21:33 +01:00
David A. Velasco
24dd513682
Added progress bar for file transfers in details view (untested)
2013-02-19 13:28:01 +01:00
David A. Velasco
f2474ae28d
Added basic menu options to the preview fragment: open, delete, see details
2013-02-18 11:23:18 +01:00
David A. Velasco
7101a04247
Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded
2013-02-14 19:21:09 +01:00
David A. Velasco
9420651936
Error messages for media playback improved
2013-02-12 12:07:42 +01:00
David A. Velasco
11c1ad8f78
Fixed bad behaviours when an error occurrs during audio playback
2013-02-12 11:26:38 +01:00
David A. Velasco
e4cd3fe54c
Removed unused code in MediaService
2013-02-11 12:46:50 +01:00
David A. Velasco
6103446ab8
Error messages for video playback reviewed
2013-02-11 11:33:50 +01:00
David A. Velasco
4dc81e5168
Removed usused drawable; list_selector rewritten from scratch with new license (and color fixed for Android before ICS)
2013-02-08 11:37:02 +01:00
David A. Velasco
f1dd1f2476
Added copyright and license notice in animation files
2013-02-08 10:01:11 +01:00
David A. Velasco
a1d2e99bb1
Removed unused animations
2013-02-08 09:55:33 +01:00
David A. Velasco
2623e9c195
Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished
2013-02-08 09:22:46 +01:00
David A. Velasco
ccfd7772df
Removed some unused classes
2013-02-08 09:05:37 +01:00
David A. Velasco
bb257ec729
Updated copyright in source files
2013-02-07 18:45:10 +01:00
David A. Velasco
586793a261
Basic video preview in a separate actitivy
2013-02-07 11:09:28 +01:00
David A. Velasco
18bf35a809
Added MediaController user interface to handle audio files in the MediaService
2013-02-06 14:14:55 +01:00
David A. Velasco
7018ae7e1f
Added music player service in background; 'open' button in details used to test (temporal)
2013-02-05 12:20:47 +01:00
David A. Velasco
1a8096380d
Temporal file icons from iOS app
2013-01-30 16:16:08 +01:00
David A. Velasco
86ad114c26
Translations updated
2013-01-30 14:31:38 +01:00
David A. Velasco
37f0586c47
Merge branch 'file_icons' into workaround_integration
2013-01-30 13:49:36 +01:00
David A. Velasco
5da9c095a4
Added dialog in the main app to advise users about the workaround app
2013-01-30 13:46:15 +01:00
David A. Velasco
fb8a8a2166
Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials
2013-01-28 13:15:28 +01:00
David A. Velasco
63106c9238
Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth
2013-01-25 15:11:10 +01:00
David A. Velasco
f440d30e42
Code ready to provide different icons for well-known MIME types
2013-01-24 13:34:27 +01:00
David A. Velasco
088b1e83a4
Cleaning-up AuthenticatorActivty code
2013-01-24 10:29:11 +01:00
David A. Velasco
2b5785556e
Merge branch 'master' into oauth_login
...
Conflicts:
AndroidManifest.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2013-01-17 14:25:49 +01:00
F.T.
2ed5f33d95
Italian strings for narrow screens; fixed version string.
2013-01-12 18:37:10 +01:00
David A. Velasco
bc1591da6c
Translations update
2013-01-11 13:26:34 +01:00
David A. Velasco
75c84c7b06
German translation updated
2013-01-11 12:45:10 +01:00
David A. Velasco
7239b9eb9d
Translations update
2013-01-10 18:38:41 +01:00
David A. Velasco
c38a3b2ef1
Merge master into oauth_login
2012-12-18 11:20:03 +01:00
David A. Velasco
279670c303
Merge remote-tracking branch 'origin/sync_review_2'
2012-12-05 23:23:10 +01:00
David A. Velasco
4558866223
Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder
2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7
Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed
2012-12-04 12:49:18 +01:00
David A. Velasco
a7535406d4
Customized error message for uploads when the local file cannot by copied to the ownCloud local directory
2012-11-30 14:39:31 +01:00
David A. Velasco
3ef64834e9
Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization.
2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb
Files uploaded in the past are copied to the local ownCloud directory during account synchronization
2012-11-30 11:29:18 +01:00
David A. Velasco
a2f48dc563
New German update
2012-11-29 16:52:29 +01:00
David A. Velasco
5dec5264b2
Updated some languages (remaining coming soon)
2012-11-29 16:01:53 +01:00
David A. Velasco
236895e7f8
Refactored app name in strings.xml
2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5
Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup
2012-11-29 11:28:34 +01:00
David A. Velasco
4c50eb4d2d
Merge of master after sync_review was merged into it
2012-11-23 10:25:06 +01:00
David A. Velasco
d49bfd0c77
Added title to rename dialog; and some cleaning
2012-11-22 10:24:26 +01:00
David A. Velasco
38a80be828
Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used
2012-11-20 14:41:04 +01:00
David A. Velasco
c301865c35
Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts
2012-11-16 16:23:45 +01:00
David A. Velasco
a7ee15e023
Renaming confussing token
2012-11-16 09:42:51 +01:00
David A. Velasco
ff2271a8c5
Download button in file details view upgraded to sync file content in both directions
2012-11-15 17:18:04 +01:00
David A. Velasco
500cbf9cea
New items in the context menu for files (not folders), depending upon its state
2012-11-06 15:13:27 +01:00
David A. Velasco
b27ebf0310
Removal of folders completed
2012-11-05 15:44:09 +01:00
David A. Velasco
cab55a8edd
Login page updated to get OAuth2 access token
2012-10-31 18:59:43 +01:00
David A. Velasco
454f15138e
Rename and remove operations connected to the contextual menu over items at the list of files
2012-10-31 17:41:57 +01:00
David A. Velasco
3d72058691
Quick fix to avoid two lines in button
2012-10-30 11:24:30 +01:00
David A. Velasco
cc1eb7a352
SSL warning with more information about certificate, accessible through a new 'Details' button
2012-10-29 15:03:34 +01:00
Bartek Przybylski
6c32365704
Solving modified date and length conflicts
2012-10-27 12:20:52 +02:00
Bartek Przybylski
4a737cb71c
updated translations
2012-10-22 21:18:20 +02:00
David A. Velasco
8f2314d80e
Improved explanation in PIN code view
2012-10-19 09:24:34 +02:00
David A. Velasco
adcb8d924b
Fixed typo in German translation
2012-10-18 17:02:43 +02:00
David A. Velasco
7c8214f096
Same text in the cancel button in PIN code activity than in all the other cancel buttons in the app
2012-10-18 16:11:29 +02:00
David A. Velasco
0514b1ba19
Added German string for PIN code explanation
2012-10-18 10:02:33 +02:00
David A. Velasco
97f21ee7be
About message moved to strings.xml
2012-10-17 19:34:31 +02:00
David A. Velasco
d0f7de3ce0
Added help text in background of empty files list
2012-10-17 19:22:40 +02:00
David A. Velasco
d193e0031b
Added explanation in the view for PIN Code creation
2012-10-17 11:04:27 +02:00
David A. Velasco
6eff1c94be
Updated text in 'Remote and local' option offered when removing a downloaded file to fit the button size' (just some languages)
2012-10-17 10:14:14 +02:00
Bartek Przybylski
e962c41aa9
updated translations
2012-10-15 17:44:19 +02:00
Bartek Przybylski
671cb91cef
add upload via wifi only option
2012-10-08 21:26:18 +02:00
Bartek Przybylski
c72f89c4ba
add no suggestion in horizontal mode in account setup activity
2012-10-08 18:31:02 +02:00
David A. Velasco
7edbe05bb5
Merge remote-tracking branch 'origin/master'
...
Conflicts:
res/values-ca/strings.xml
res/values-el/strings.xml
2012-10-08 09:10:37 +02:00
David A. Velasco
76ba00b2b2
Cancellation of current download in details view - UI changes
2012-10-08 09:03:12 +02:00
Bartek Przybylski
826c7405f6
dont suggest username in account setup screen
2012-10-07 21:43:40 +02:00
Bartek Przybylski
63da5e3b6d
correct languages mapping
2012-10-06 11:28:51 +02:00
Bartek Przybylski
0caca3fc85
upating localization strings
2012-10-05 16:09:30 +02:00
David A. Velasco
0c3aaf3c5a
Fixed typo in link to owncloud.com
2012-10-03 11:52:54 +02:00
David A. Velasco
131d97d74d
A new string
2012-09-13 17:08:00 +02:00
David A. Velasco
261aaf5001
Improvements in SSL certifcates checking: URL is checked with the hostname in the certificate and all the problems are shown in the same dialog
2012-09-07 14:11:08 +02:00
David A. Velasco
48f13c8adc
SSL connections update: notice about untrusted certificates and allow the user save them as reliable
2012-09-05 13:46:30 +02:00
David A. Velasco
91bc3fdb1e
Added notification for failures in manual synchronizations; some improvements in the management of exceptions occurred while synchronizing (more TODO)
2012-08-23 17:09:05 +02:00
David A. Velasco
4e57c008b7
Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI
2012-08-22 13:53:03 +02:00
David A. Velasco
3e6a936bd4
Added link to register new user in landscape view
2012-08-21 13:25:40 +02:00
David A. Velasco
081b333eb1
Added link to register a new user at owncloud.com ; fixed cancel button in account creation for SGS3
2012-08-20 14:36:46 +02:00
David A. Velasco
1ecd2b61c5
Multiple upload available from the app
2012-08-14 12:37:08 +02:00
David A. Velasco
58ebd9d7e1
FIleDisplayActivity refactored to fix view never updated after installation in some devices and problems when all the accounts are deleted
2012-08-08 12:30:11 +02:00
David A. Velasco
532492bf9b
Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact.
2012-08-03 11:39:08 +02:00
David A. Velasco
38ece35da5
Fixed crash by URL with whitespaces in login page; reviewed error handling and user info in connection checking
2012-08-02 13:28:33 +02:00
Bartek Przybylski
a4ba6170ea
moving from eu.alefzero.eu to com.owncloud.android
2012-07-31 17:43:37 +02:00
David A. Velasco
6a9eaaf9aa
Better failure handling in files renaming and removal
2012-07-30 15:11:59 +02:00
David A. Velasco
76a123fc35
Added failure handling to directory creation
2012-07-30 14:06:53 +02:00
David A. Velasco
9ae0e1746a
Fixed cancel button in landscape account activity
2012-07-30 13:14:28 +02:00
David A. Velasco
3ab381f0e0
More hardcoded strings passed to string resources
2012-07-30 12:58:36 +02:00
David A. Velasco
e8852fa725
Fixed compatibility issue in local deletion and text typo
2012-07-30 09:46:24 +02:00
Bartek Przybylski
f0fb5848f2
updated translations
2012-07-29 10:23:03 +02:00
Bartek Przybylski
0cced280a4
allow removing local file only
2012-07-28 21:15:41 +02:00
David A. Velasco
7c93676d6f
Make resource values for some hardcoded string
2012-07-27 15:02:03 +02:00
David A. Velasco
275eb1f8f8
Fixed: problems in handling a file that is still uploading but in the files list because a synchronization was triggered and finished; problems in UI refresh after removing or renaming a file, while in double pane mode
2012-07-27 14:29:46 +02:00
David A. Velasco
f3ba107585
Upload improvements: better control of errors, updated use of status notifications, removed toast notifications, new isUploading(...) mehtod
2012-07-26 18:35:09 +02:00
David A. Velasco
81970c8131
Reviewed error handling and notifications in downloads
2012-07-25 12:04:08 +02:00
David A. Velasco
20c5767a04
Minor typos and spelling corrected
2012-07-24 09:08:29 +02:00
Bartek Przybylski
7f75f13f0c
make confirmation dialog more universal
2012-07-23 19:09:44 +02:00
David A. Velasco
eb2a7bcec2
Replaced strings in two pieces with formatted string
2012-07-23 14:38:16 +02:00
Bartek Przybylski
53bc15cdbf
allow username with @, hide search menu item until sherlockactionbar wont put it to master
2012-07-22 09:01:22 +02:00
Bartek Przybylski
3c0e72c400
show buttons in two lines, they get squeezed when button text is too long
2012-07-21 22:31:18 +02:00
Bartek Przybylski
adf87805bb
adding translations and transifex third party tool
2012-07-21 22:10:36 +02:00
David A. Velasco
c175ba68cd
Forgot the new icon!
2012-07-20 10:14:27 +02:00
David A. Velasco
2a04c6ae5d
Some fixes about downloads and how the detals view and list view is updated when downloads start and finish
2012-07-20 10:13:50 +02:00
Bartek Przybylski
f8e0f7a582
use star instead of heart, download while if its marked as favorite,ignoring last update
2012-07-19 00:04:37 +02:00
David A. Velasco
0583bc8b33
Pin code messages update
2012-07-17 15:16:27 +02:00
David A. Velasco
463b30c46a
Avoid crashes when an external app makes a bad response for the selection of a file to upload
2012-07-17 14:51:36 +02:00
David A. Velasco
c0645e6832
Trigger synchronization when current account is changed; remove redundant accounts list in preferences
2012-07-16 11:34:37 +02:00
David A. Velasco
91b1728493
More fixes to PIN code
2012-07-13 14:46:40 +02:00
David A. Velasco
50d8905f00
File removal in server completed
2012-07-12 13:49:21 +02:00
David A. Velasco
8b24606331
Fixed confirmation dialog for deletion
2012-07-12 10:55:47 +02:00
David A. Velasco
6701c9842d
Delete remote file - confirmation dialog added
2012-07-12 09:48:55 +02:00
Bartek Przybylski
a70c4c658f
addming missing file, show softkeyborad on pin activity and change name activity
2012-07-11 17:23:50 +02:00
David A. Velasco
10f07d62f5
Temporal layout for rename
2012-07-11 10:47:15 +02:00
Bartek Przybylski
02610cad7d
messy rename file
2012-07-10 22:52:31 +02:00
David A. Velasco
de5d818781
Strings extracted from PinCodeActivity to resources
2012-07-09 15:19:44 +02:00
David A. Velasco
3e4f8b4f0d
Better policy to show PIN Code
2012-07-09 15:10:26 +02:00
David A. Velasco
93de9f91d5
Pin code
2012-07-09 11:11:44 +02:00
Bartek Przybylski
3113c45909
keep file in sync and initial commit for file sharing
2012-07-08 16:57:48 +02:00
Bartek Przybylski
3e9d818a08
revert icon to old one
2012-07-07 19:54:46 +02:00
Lennart Rosam
5e5cd7f889
Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
2012-07-03 22:50:52 +02:00
Bartek Przybylski
9650ce5cf8
change string from location to URL
2012-07-02 19:08:54 +02:00
David A. Velasco
41f2cf1169
Download failures not treated as successes
2012-07-02 10:41:56 +02:00
Lennart Rosam
678aeb2d37
Updated app icon
2012-06-29 16:16:26 +02:00
David A. Velasco
72141b60fb
Update of messages when uploads finish
2012-06-29 10:36:25 +02:00
David A. Velasco
49c1f9e318
Better file opening; new ownCloud logo in account settings page
2012-06-27 18:32:20 +02:00
David A. Velasco
2a61a59a09
Fixed visibility problems of menu icons (sizes, and color in 2.3.x)
2012-06-27 17:05:00 +02:00
Bartek Przybylski
f7fb16963b
always show image preview if there is only enough memory
2012-06-25 20:55:34 +02:00
Bartek Przybylski
832c1f4842
make cancel button usable on account create activity
2012-06-21 20:02:33 +02:00
Bartek Przybylski
5fc8be29f9
about dialog with version
2012-06-21 19:37:33 +02:00
Bartek Przybylski
b55f321125
add manage accounts to preference screen
2012-06-18 18:39:11 +02:00
Bartek Przybylski
6e3b5f488c
dummy crash upload dialog
2012-06-13 20:47:38 +02:00
Bartek Przybylski
9dd2cf294a
instant uploading, first attempt
2012-05-27 15:57:18 +02:00
Bartek Przybylski
78faee207b
removing fancy upload bar for now
2012-05-26 21:23:01 +02:00
Bartek Przybylski
21980deb38
fix filename display
2012-05-26 20:59:46 +02:00
Bartek Przybylski
e759addf42
show modification timestamp and size of file
2012-05-26 14:56:30 +02:00
Bartek Przybylski
24a1111aa1
making file download using progressbar view
2012-05-26 13:47:26 +02:00
Bartek Przybylski
63f68f1020
use view instead of dialog about no setup account
2012-05-25 21:32:20 +02:00
Lennart Rosam
b735fc9458
Fixed navigation behaviour: HomeAsUp takes you up a dir
2012-05-25 07:01:12 +02:00
Lennart Rosam
39307229cd
Hide creation info when the uses ownCloud version is affected by oc-764
2012-05-23 23:50:59 +02:00
Lennart Rosam
62908d1755
Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
2012-05-23 19:59:51 +02:00
Lennart Rosam
e8c9e5b09a
Filelisting using intents and OCFile.getId() instead of string matching
...
in db which can be very very slow if there are lots of files
2012-05-23 19:59:29 +02:00
Bartek Przybylski
50695f6f5b
removing filedrag for now
2012-05-23 19:10:12 +02:00
Bartek Przybylski
684ae90ca7
making icons bit smaller, making upload progressbar less cpu eating
2012-05-22 22:44:57 +02:00
Lennart Rosam
d722fe8229
Fix layout: Missing label, fix for smaller screens
2012-05-22 18:15:56 +02:00
Bartek Przybylski
4ee419da91
remove preferences its not needed for now
2012-05-21 22:57:17 +02:00
Lennart Rosam
38683b9143
Layout reworked to relative
2012-05-18 14:40:46 +02:00
Lennart Rosam
cb8761f66f
New Layout for FileDetailsFragment (needs to be redone with
...
RelativeLayout for better performance), Fix AppCrashes on rotation
change
2012-05-18 14:05:21 +02:00
Lennart Rosam
3727806652
Intermediate commit: Work on new FileDetailFragment layout, simplified
...
it's code a bit and renamed a color. Layout is WIP
2012-05-18 08:09:31 +02:00
Lennart Rosam
ffc941e440
FileDetailsFragment now working on tablets
2012-05-18 00:37:53 +02:00
Bartek Przybylski
b56c8e05d8
holo icons
2012-05-16 18:52:45 +02:00
Lennart Rosam
020d2885ce
Tablet fixes. Goal is to get tapping on a file to display its details.
...
Does not work yet - WIP. Also code optimization: Make
FileDetailFragment less complex by passing in a OCFile directly instead
of reconstructing it.
2012-05-15 23:12:07 +02:00
Bartek Przybylski
b999f542c0
new icons, new uploader
2012-05-15 21:52:59 +02:00
Bartek Przybylski
2c9b84a862
allow account deleting from account picker
2012-05-13 22:28:44 +02:00
Bartek Przybylski
0aeb425885
adjusting design to holo, stability for account setup
2012-05-13 16:13:13 +02:00
Bartek Przybylski
fae44486b9
sync option in filelist menu
2012-05-04 20:34:05 +02:00
Bartek Przybylski
10c04c6d77
new stuff for account authenticator
2012-05-03 15:37:30 +02:00
Bartek Przybylski
fc49e582c5
fix white text on configuration screen
2012-05-03 12:14:44 +02:00
Bartek Przybylski
a10efb1229
making callback to context not view
2012-05-02 00:04:17 +02:00
Bartek Przybylski
dc7cafe677
initial commit of editbox with badge
2012-05-01 23:37:37 +02:00
Lennart Rosam
6e43d84b17
Started working on the "Where is my device?" feature
2012-04-15 17:31:08 +02:00
Bartek Przybylski
ff36d90802
adding use ssl mode
2012-04-15 09:54:21 +02:00
Lennart Rosam
a29469016e
More cleanup / refactoring: Name Fragments consistantly way
2012-04-14 18:55:15 +02:00
Lennart Rosam
8f2840fe11
Incorporated the ownCloud Blue into the ActionBar
2012-04-12 00:34:07 +02:00
Lennart Rosam
30c2ede8e5
Migration to ActionBarSherlock 4.0.1 / Custom Adapter to override text
...
colors in the ListNavigation Dropdown spinner
2012-04-10 04:40:53 +02:00
Bartek Przybylski
cf2c2eedc5
send contacts to oc instance
2012-04-08 18:41:23 +02:00
Bartek Przybylski
d8d535a0a2
handle dir creation from filelist
2012-04-08 00:25:51 +02:00
Bartek Przybylski
198c31f9b0
fix of filedisplay for phones
2012-04-07 12:47:26 +02:00
Lennart Rosam
320e446748
FileDetail fragement is now showing a text hint if there is no file
...
selected.
2012-04-07 02:52:50 +02:00
Lennart Rosam
4cbe903b8a
Make account selectable from preferences
2012-04-07 02:15:38 +02:00
Lennart Rosam
9996436ccc
Merged request #3
2012-04-01 15:06:23 +02:00
Bartek Przybylski
1083eb8683
warnging and legacy class removing
2012-02-25 18:35:54 +01:00
Bartek Przybylski
007edfe102
first download & preview scratch, removing unused code, changing noncompatible code
2012-02-19 16:06:00 +01:00
Bartek Przybylski
dbaff80211
proper file list handling, file basic stuff dispaying
2012-02-18 16:38:36 +01:00
Bartek Przybylski
e28442c87d
bit better handling of filelist
2012-02-12 14:43:09 +01:00
Bartek Przybylski
6deca0f9b1
some file list handling, action bar added
2012-02-11 23:11:57 +01:00
Lennart Rosam
ca5455e88d
Started swapping our ActionBar in favor of ActionBarSherlock
2012-02-05 22:47:25 +01:00
Lennart Rosam
a941af2ec2
- Easier to enter account information. (Input-Types, singleLine = true)
...
- XML pretty print
2012-02-04 17:55:17 +01:00
Lennart Rosam
dc8c32fb3f
Refactoring: Added comments to every class, as well as a copyright
...
notice. Also, some classes were moved to packages where they make sense
2012-02-04 17:41:28 +01:00
Lennart Rosam
db0f0001f9
More refactoring
2012-02-04 16:23:41 +01:00
Lennart Rosam
896f145cf6
Improved first run experience and added additional icons
2012-02-01 00:43:28 +01:00
Lennart Rosam
32ce46d9d8
Added a landing page for the app.
2012-01-22 21:08:47 +01:00
Lennart Rosam
0a97bf3a39
Portrait layout was broken after refactoring
2012-01-22 21:05:10 +01:00
Lennart Rosam
30734a9404
Heavy refactoring: Moved UI things to UI packages
2012-01-22 19:05:47 +01:00
Lennart Rosam
09cbb3d20e
Adjusted resolution according to googles specs
2012-01-22 13:03:28 +01:00
Bartek Przybylski
17455f57d2
fragments branch initial commit
2012-01-14 00:31:56 +01:00
Bartek Przybylski
8f9a9a8694
first run setup fix
2011-10-07 17:54:28 +02:00
Sven Aßmann
86cc60bc12
changing the syncadapter target model authority to android contacts
2011-09-27 11:28:23 +02:00
Bartek Przybylski
86261ea6e6
added syncadapter for xml
2011-09-17 17:10:32 +02:00
Bartek Przybylski
9ca5cc327d
adding specified adapter for contacts and files
2011-09-17 16:03:05 +02:00
Bartek Przybylski
55bcc455d2
contentprovider for contacts added
2011-09-17 15:41:44 +02:00
Sven Aßmann
ae68956174
change the display text of sync account to: "Sync Files&Contacts"
2011-09-15 21:37:19 +02:00
Bartek Przybylski
6f16202543
proper filename displaying, bigger icons
2011-09-04 22:46:53 +02:00
Bartek Przybylski
7e20e39f25
missing files
2011-09-04 13:47:06 +02:00
Bartek Przybylski
769fe95791
new path style in main window
2011-09-04 13:35:27 +02:00
Bartek Przybylski
154bb85cf1
initial commit
2011-08-19 22:37:35 +02:00