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 |
|