masensio
|
ebbc8f2ead
|
Update images
|
2013-10-30 09:08:02 +01:00 |
|
masensio
|
e86d7cd9b4
|
Update setup and strings
|
2013-10-29 14:36:09 +01:00 |
|
masensio
|
c2abbaaedb
|
Merge branch 'develop' into setup_buttons
|
2013-10-29 14:13:24 +01:00 |
|
masensio
|
6ace8ab1c1
|
Update packageName
|
2013-10-29 14:10:42 +01:00 |
|
masensio
|
ab946b9af6
|
Adding default images for dropdown and indeterminate_progress in ActionBar
|
2013-10-29 13:18:49 +01: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 |
|
masensio
|
dd59f5871c
|
OC-1833: Add CustomButton class to can change the background of buttons
|
2013-10-28 12:58:56 +01:00 |
|
masensio
|
6e21c84026
|
Customize buttons
|
2013-10-25 15:06:10 +02:00 |
|
masensio
|
a22ca4f4a2
|
Fix error in AndroidManifest
|
2013-10-25 14:08:52 +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 |
|
masensio
|
7656cff3bb
|
Update package name
|
2013-10-24 18:12:00 +02:00 |
|
David A. Velasco
|
c217f7229b
|
Merge pull request #287 from LukeOwncloud/setup_md
Setup.md updated.
|
2013-10-24 00:46:13 -07:00 |
|
Luke Owncloud
|
0021bc1c97
|
positive description about what app does
|
2013-10-24 09:40:03 +02:00 |
|
Luke Owncloud
|
264186ea6b
|
"follow" instead of "obey"
|
2013-10-24 09:35:53 +02:00 |
|
Luke Owncloud
|
13da4e0e4b
|
mention contributor-agreement in SETUP.md
|
2013-10-24 09:20:13 +02:00 |
|
Luke Owncloud
|
6d83b3503b
|
Merge branch 'develop' of github.com:owncloud/android into setup_md
|
2013-10-24 09:19:03 +02:00 |
|
David A. Velasco
|
d0c9ad1091
|
Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects
|
2013-10-23 18:50:30 +02:00 |
|
David A. Velasco
|
f88f81e906
|
Replace 'ownCloud' with reference to app_name
|
2013-10-23 12:54:49 +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 |
|
Luke Owncloud
|
e6f9fc1480
|
added first line of PR https://github.com/owncloud/android/pull/219
fixing issue pointed out by dper:
https://github.com/owncloud/android/pull/219#issuecomment-26715595
|
2013-10-22 11:13:55 +02:00 |
|
masensio
|
ab82a818d2
|
Merge branch 'setup_multiaccount' into setup_app_name
|
2013-10-22 10:27:28 +02:00 |
|
masensio
|
9610c61c9f
|
Delete Override onContentChanged method in AccountSelectActivity
|
2013-10-22 10:24:02 +02:00 |
|
masensio
|
017f9429c8
|
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
|
2013-10-22 10:22:18 +02:00 |
|
masensio
|
673c884752
|
OC-1770: When deleting the account, log in screen is not shown
|
2013-10-22 10:17:09 +02:00 |
|
David A. Velasco
|
4d9305f35f
|
Merge pull request #282 from LukeOwncloud/develop
fix git update instructions
|
2013-10-21 02:56:16 -07:00 |
|
Luke Owncloud
|
6af47d271e
|
fix git update instructions
|
2013-10-21 11:40:20 +02:00 |
|
David A. Velasco
|
69d9ecdb6e
|
Merge pull request #281 from LukeOwncloud/develop
Enable building with Maven .
|
2013-10-21 01:33:29 -07:00 |
|
Luke Owncloud
|
a43fef7dbf
|
enabled project for building with maven (eclipse building stays untouched)
added/updated compile instructions in setup.md
added some eclipse generated files to .gitignore
|
2013-10-21 09:29:05 +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
|
194a7360f8
|
Merge branch 'develop' into release-1.4.6
|
2013-10-18 10:33:26 +02:00 |
|
masensio
|
881727f050
|
Merge pull request #278 from owncloud/fix_synchronization_after_addition_of_infinite_propfind_in_server
Added depth parameters to ervery PROPFIND method
|
2013-10-18 01:31:48 -07:00 |
|
David A. Velasco
|
db026d8a91
|
Added depth parameters to ervery PROPFIND method
|
2013-10-18 10:22:16 +02:00 |
|
masensio
|
2b5c567938
|
Delete maxSdkVersion=17 for workaround
|
2013-10-18 10:15:55 +02:00 |
|
masensio
|
6d17810140
|
Update serialVersionUIDs and version name/number
|
2013-10-18 09:01:17 +02:00 |
|