mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
1766 commits 227 branches 1571 tags 618 MiB
Commit graph

623 commits

Author SHA1 Message Date
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
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