masensio
|
7ed3179100
|
Merge branch 'develop' into improve_notifications_pr_400_with_develop
|
2014-03-21 10:37:11 +01:00 |
|
masensio
|
2d6826fe8b
|
Merge pull request #400 from tommyd3mdi/develop
Notification improvements
|
2014-03-21 10:32:49 +01:00 |
|
David A. Velasco
|
0336eced64
|
Fixed lost of 'shared' attribute during full synchronization process for already known shares
|
2014-03-21 09:05:19 +01:00 |
|
David A. Velasco
|
4f4c6843a7
|
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
|
2014-03-20 17:48:23 +01:00 |
|
David A. Velasco
|
4ab61cf5ec
|
Update library reference
|
2014-03-20 17:48:17 +01:00 |
|
David A. Velasco
|
4d3661299b
|
Merge pull request #442 from owncloud/share_link__reuse_link_shared_in_server
Reuse public link already existing in server when user tries to reshare a file.
|
2014-03-20 17:43:07 +01:00 |
|
David A. Velasco
|
ed9f1740be
|
Update reference to owncloud-library
|
2014-03-20 17:40:23 +01:00 |
|
masensio
|
4ae57b5bea
|
Changes from comments in PR#443
|
2014-03-20 16:51:00 +01:00 |
|
masensio
|
c6f0847866
|
Changes from comments in PR#443
|
2014-03-20 16:15:59 +01:00 |
|
masensio
|
3064f1fc4b
|
Changes from comments in PR#442, in oc-project
|
2014-03-20 15:35:23 +01:00 |
|
David A. Velasco
|
41614a81c1
|
Added notification icons with dark background to fix contrast in Android 2.x and 3.x
|
2014-03-20 14:04:09 +01:00 |
|
masensio
|
d9219441b1
|
Revert "Changes from comments in PR#442, in oc-project"
This reverts commit 0aa9a0bc6c.
|
2014-03-20 14:01:35 +01:00 |
|
masensio
|
0aa9a0bc6c
|
Changes from comments in PR#442, in oc-project
|
2014-03-20 13:52:34 +01:00 |
|
David A. Velasco
|
8a9f504138
|
Fixed contrast of text in notifications for Android 2.x and 3.x
|
2014-03-20 12:56:44 +01:00 |
|
David A. Velasco
|
604abaf3b4
|
Grant that progress bar in notifications is shown in Android 2.x and 3.x devices
|
2014-03-20 10:43:06 +01:00 |
|
David A. Velasco
|
1b8b4cf3b7
|
Updated Android support library, mainly to fix crash in Android 3.x devices due to new API for notifications
|
2014-03-20 10:22:52 +01:00 |
|
masensio
|
47465025ce
|
Update library reference: change in ShareXMLParser, parse expiration date with WebdavUtils.parseResponseDate
|
2014-03-20 09:26:53 +01:00 |
|
masensio
|
b0cfec7a00
|
Add auth_unsupported_basic_auth string
|
2014-03-20 09:08:02 +01:00 |
|
masensio
|
09cc36272b
|
Merge branch 'develop' into regular_authentication_in_saml_server
|
2014-03-20 09:02:29 +01:00 |
|
Mr. Jenkins
|
53fbd428af
|
[tx-robot] updated from transifex
|
2014-03-20 01:14:32 -04:00 |
|
masensio
|
432d696432
|
Merge branch 'develop' into regular_authentication_in_saml_server
|
2014-03-19 17:57:56 +01:00 |
|
masensio
|
6fc5f69f80
|
Update library reference: fix bug in expiration date for Share
|
2014-03-19 17:43:51 +01:00 |
|
masensio
|
1fb1a3294e
|
Merge branch 'develop' into share_link__reuse_link_shared_in_server
|
2014-03-19 17:22:31 +01:00 |
|
masensio
|
738ea33c06
|
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
|
2014-03-19 17:17:55 +01:00 |
|
masensio
|
d326d100ed
|
Revert "Prevent that full synchronization process browses deeper when already knows no change exists under the current folder"
This reverts commit dabcf4dce4.
|
2014-03-19 17:00:27 +01:00 |
|
David A. Velasco
|
f5a9c9600e
|
Merge pull request #441 from owncloud/allow_multiline_checkbox_preferences_pr_395_with_develop
Allow multiline preferences, not just checkboxes
|
2014-03-19 16:59:24 +01:00 |
|
David A. Velasco
|
68482e5f66
|
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
|
2014-03-19 16:58:10 +01:00 |
|
masensio
|
a9c0d1c62b
|
Update auth_fail_get_user_name string
|
2014-03-19 10:31:18 +01:00 |
|
masensio
|
71e049394e
|
OC-3390: Shows message about 'not support authentication' under server address
|
2014-03-19 10:07:56 +01:00 |
|
masensio
|
3e108163bc
|
Merge branch 'develop' into regular_authentication_in_saml_server
|
2014-03-19 08:55:37 +01:00 |
|
Mr. Jenkins
|
d3980d480f
|
[tx-robot] updated from transifex
|
2014-03-19 01:14:34 -04:00 |
|
masensio
|
705bee08fa
|
OC-3390: Message is shown in the login screen instead of an alert message: Change the alert dialog by an error message under server address
|
2014-03-18 15:13:50 +01:00 |
|
masensio
|
407fb8f912
|
Update versionName and versionCode in AndroidManifest.xml (oc and workaround))
|
2014-03-18 14:54:00 +01:00 |
|
masensio
|
1fff2077a0
|
OC-3311: Update background color of image preview to black
|
2014-03-18 14:52:05 +01:00 |
|
masensio
|
0d2c764638
|
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
|
2014-03-18 14:43:34 +01:00 |
|
masensio
|
c80357f750
|
OC-3386:(Fix bug) An alert saying 'trying to login' is shown before clicking the to connect
|
2014-03-18 14:41:25 +01:00 |
|
masensio
|
b124167f50
|
Merge pull request #395 from dontcallmedom/master
allow multi-line checkbox for preferences with long titles
|
2014-03-18 14:28:17 +01:00 |
|
masensio
|
3806916a48
|
Merge branch 'develop' into regular_authentication_in_saml_server
|
2014-03-18 14:21:26 +01:00 |
|
masensio
|
d10c10532f
|
OC-3381: (Fix bug) In preferences, the 'instant upload via WIFI' field is multiline but only use two lines instead of three
|
2014-03-18 13:40:28 +01:00 |
|
masensio
|
6e86dfb001
|
OC-3376: 'manage account' field is multiline, in preferences
|
2014-03-18 13:36:16 +01:00 |
|
masensio
|
d9da1e9ba3
|
Merge branch 'develop' into share_link__reuse_link_shared_in_server
|
2014-03-18 12:52:24 +01:00 |
|
masensio
|
a043bcd8de
|
OC-3314: Modify CreateShareOperation#run in the application so that it uses GetRemoteSharesForFileOperation() to get a remote link in the server (if exists) and use it without creating a new one
|
2014-03-18 12:51:15 +01:00 |
|
Mr. Jenkins
|
ee28694a31
|
[tx-robot] updated from transifex
|
2014-03-18 01:14:30 -04:00 |
|
Philippe MARASSE
|
28ef4217e5
|
updated menu from github comments
|
2014-03-17 22:15:41 +01:00 |
|
masensio
|
7c19578421
|
OC-3354: (Fix bug) In the pincode field, it the field doesn't fit, suspension points doesn't appear
|
2014-03-17 14:04:18 +01:00 |
|
masensio
|
9284d44907
|
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
|
2014-03-17 13:44:32 +01:00 |
|
masensio
|
92c9049091
|
Merge branch 'develop' into regular_authentication_in_saml_server
|
2014-03-17 13:40:11 +01:00 |
|
masensio
|
d01e065586
|
OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method
|
2014-03-17 13:39:03 +01:00 |
|
David A. Velasco
|
d150299b1c
|
Updated reference to ownCloud library with reduced logs in operations in shares
|
2014-03-17 13:15:18 +01:00 |
|
David A. Velasco
|
dabcf4dce4
|
Prevent that full synchronization process browses deeper when already knows no change exists under the current folder
|
2014-03-17 13:02:36 +01:00 |
|