mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 08:24:08 +03:00
Code Issues Projects Releases Packages Wiki Activity
4535 commits 221 branches 1588 tags 639 MiB
Commit graph

4535 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David A. Velasco
9d490aaab2 Grant consistency of size of folders with every update operation 2013-10-22 12:48:58 +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
9060663f66 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-22 08:26:40 +02:00
David A. Velasco
bb45503376 Trigger synchronization of current folder when the app is started or the current account changed 2013-10-21 13:27:33 +02:00
David A. Velasco
5b6475cc84 Keep saved the calculated size of child-folders when a folders is refreshed 2013-10-21 12:14:44 +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
e0dc1134f8 Check changes in eTag of folders BEFORE requesting their list of contents 2013-10-21 10:51:58 +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
David A. Velasco
966daf3b9e Enforced check of local modification date when synchronizing file contents to avoid problems with apps triggering a wrong FileObserver#CLOSE_WRITE event 2013-10-18 13:24:56 +02:00
David A. Velasco
e3be4babaf Disable eTag as a criteria for synchronization of file contents 2013-10-18 13:16:26 +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
David A. Velasco
7c9d9e7b3a Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-18 12:28:09 +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
David A. Velasco
8bd6f85e22 Fixed update of size in folders when browsing down and up through new folders in servers 2013-10-18 10:08:24 +02:00
masensio
6d17810140 Update serialVersionUIDs and version name/number 2013-10-18 09:01:17 +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
db1ea01561 Merge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_network_connection 
Fix fails in uploads after fall and rise of network connection
 2013-10-16 05:26:02 -07:00
David A. Velasco
af62f9857d Refactoring FileContentProvider and FileDataStorageManager: deletion of subfolders in provider & transactions on database connection 2013-10-16 13:04:49 +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
David A. Velasco
47b7a164de Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into refresh_folder_contents_when_browsed_into 2013-10-14 14:55:50 +02:00
masensio
9fcc118b8a 0C-1647: Enable/Disable Create Account option 2013-10-14 13:39:22 +02:00