David A. Velasco
|
bb34e0f480
|
Merge branch 'develop' into clean_up
|
2013-10-31 17:10:09 +01:00 |
|
Mr. Jenkins
|
0dbb1876fa
|
[tx-robot] updated from transifex
|
2013-10-30 01:39:00 -04:00 |
|
Mr. Jenkins
|
dd9da1a1af
|
[tx-robot] updated from transifex
|
2013-10-29 05:35:45 -04: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 |
|
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 |
|
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 |
|