David A. Velasco
|
67325ed36c
|
Merge branch 'master' into develop
|
2013-06-26 18:13:11 +02:00 |
|
David A. Velasco
|
66a005416c
|
Merge branch 'release-1.4.1' into develop
|
2013-06-26 18:13:05 +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
|
04803ae879
|
Fixed false error message and lack of recheck when a server certificate is explicitly accepted by the user in the login view
|
2013-06-26 12:45:35 +02:00 |
|
David A. Velasco
|
77428a495b
|
Merge branch 'fixed_update_of_action_bar_in_successful_rename' into release-1.4.1
|
2013-06-26 12:23:22 +02:00 |
|
David A. Velasco
|
646abfa08d
|
Fixed update of action bar in successful rename
|
2013-06-26 11:47:20 +02:00 |
|
David A. Velasco
|
58733dfa12
|
Generated serialVersionUIDs updated
|
2013-06-26 09:23:53 +02:00 |
|
David A. Velasco
|
f63c4ad77a
|
Version bump: 1.4.1
|
2013-06-26 09:17:53 +02:00 |
|
David A. Velasco
|
0f2a7475b1
|
Disabled logging options until fixed
|
2013-06-26 09:13:28 +02:00 |
|
David A. Velasco
|
863f3f68d2
|
Merge pull request #197 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing
Fixed crash due to uploads to accounts not already existing
|
2013-06-25 23:51:58 -07:00 |
|
Jenkins for ownCloud
|
4d1f8d7dc1
|
[tx-robot] updated from transifex
|
2013-06-26 01:18:51 +02:00 |
|
masensio
|
2402e9ed4c
|
Merge pull request #195 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing
Fixed crash due to uploads to accounts not already existing
|
2013-06-25 06:16:25 -07:00 |
|
masensio
|
2df8f56e5e
|
OC-460:URL-input GONE. OC-394
|
2013-06-25 14:13:04 +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
|
af4b0bc90b
|
Fixed focus in AuthenticarActivity for changing password so that server URL is not editable
|
2013-06-21 14:29:47 +02:00 |
|
David A. Velasco
|
8f1566a21c
|
Removed toast message for updating credentials when user manually accessed to the AcountAuthenticatorActivity
|
2013-06-21 14:16:45 +02:00 |
|
David A. Velasco
|
a102f26925
|
AuthenticatorActivity is started when 'change password' is selected for a list in the list of accounts
|
2013-06-21 14:04:48 +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
|
5e49cadb2a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-06-19 17:03:13 +02:00 |
|
David A. Velasco
|
5dc43aab3c
|
Merge pull request #186 from owncloud/fixed_contradicted_messages_in_login_view
Fixed contradicted messages in login view
|
2013-06-19 08:02:50 -07:00 |
|
David A. Velasco
|
0c7f1af8d0
|
Merge branch 'fixed_contradicted_messages_in_login_view' into develop
|
2013-06-19 12:17:16 +02:00 |
|
David A. Velasco
|
d612f37de4
|
'Refresh' options in menus differentiated: 'refresh file' and 'refresh account'
|
2013-06-18 15:04:45 +02:00 |
|
David A. Velasco
|
19bcc99538
|
Fixed: details about progress are shown when the notification of an upload is clicked
|
2013-06-18 14:59:36 +02:00 |
|
David A. Velasco
|
6ca1e170f7
|
Fixed crash, error notified instead
|
2013-06-18 14:04:51 +02:00 |
|
David A. Velasco
|
c4ac05dee2
|
REFACTORING: moved AccountUtils to .authentication package
|
2013-06-18 11:34:08 +02:00 |
|
Jenkins for ownCloud
|
9d24b7ca53
|
[tx-robot] updated from transifex
|
2013-06-18 01:38:06 +02:00 |
|
David A. Velasco
|
7f34fba421
|
ConflictsResolveActivity protected against access to non-existing account
|
2013-06-17 14:43:26 +02:00 |
|
David A. Velasco
|
c43b15deab
|
UploadFileActivity protected agains access to non-existing account
|
2013-06-17 14:21:33 +02:00 |
|
masensio
|
0fac67fcd0
|
Merge pull request #140 from owncloud/folderSizeInfo
Issue #28 folders don't show date and size info
|
2013-06-17 04:34:59 -07:00 |
|
masensio
|
90428ec4c7
|
Merge remote-tracking branch 'origin/develop' into folderSizeInfo
Conflicts:
.classpath
tests/.classpath
|
2013-06-17 13:32:40 +02:00 |
|
David A. Velasco
|
ca74319956
|
Merge remote-tracking branch 'origin/develop' into check_account_existance_in_gallery
|
2013-06-17 12:28:42 +02:00 |
|
David A. Velasco
|
a65b73a972
|
Merge pull request #178 from owncloud/login_smart_clip_of_URL_suffix
OC-208: suffix remote.php/webdav. OC-34
|
2013-06-17 03:07:32 -07:00 |
|
David A. Velasco
|
10b014a19a
|
Fixed bad transitions after adding protection for removed accounts to PreviewVideoActivity
|
2013-06-17 11:16:39 +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 |
|
David A. Velasco
|
f9babe7b7d
|
PreviewImageActivity protected against access to non-existing account
|
2013-06-14 12:53:45 +02:00 |
|
Jenkins for ownCloud
|
5882a655c6
|
[tx-robot] updated from transifex
|
2013-06-14 02:17:56 +02:00 |
|
David A. Velasco
|
3440b8a1d2
|
Fixed repeated request for create first account when all the accounts where removed after the app was left in an actitivy not root in its task
|
2013-06-13 11:35:17 +02:00 |
|
Jenkins for ownCloud
|
6d2deaa2dc
|
[tx-robot] updated from transifex
|
2013-06-13 01:37:58 +02:00 |
|