Merge remote-tracking branch 'upstream/develop' into
[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / FileSyncAdapter.java
2013-11-12 David A. VelascoRefactored to build ownCloud app with oc_framework...
2013-11-11 masensioMerge pull request #302 from owncloud/remove_automatic_...
2013-11-11 David A. VelascoReviewed integration with sychronization framework...
2013-11-06 David A. VelascoMerge pull request #294 from owncloud/setup_buttons
2013-11-06 David A. VelascoMerge branch 'develop' into setup_buttons
2013-11-06 David A. VelascoMerge branch 'develop' into setup_buttons
2013-10-29 masensioMerge branch 'develop' into setup_buttons
2013-10-29 masensioUpdate packageName
2013-10-28 David A. VelascoMerge branch 'develop' into clean_up
2013-10-24 masensioUpdate package name
2013-10-24 masensioMerge pull request #269 from owncloud/refresh_folder_co...
2013-10-24 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-24 David A. VelascoReset in policy of synchronization for full account...
2013-10-24 Luke OwncloudMerge branch 'develop' of github.com:owncloud/android...
2013-10-23 David A. VelascoFixed bug in access to SYNC_MESSAGE identifier for...
2013-10-23 David A. VelascoFixed bug in access to SYNC_MESSAGE identifier for...
2013-10-23 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-22 David A. VelascoMerge pull request #284 from owncloud/setup_app_name
2013-10-22 masensioMerge branch 'contact_settings' into setup_app_name
2013-10-22 David A. VelascoGrant consistency of size of folders with every update...
2013-10-22 masensioMerge branch 'setup_colors' into setup_app_name
2013-10-22 masensioMerge branch 'setup_colors' into setup_app_name
2013-10-22 masensioMerge branch 'setup_multiaccount' into setup_app_name
2013-10-22 masensioMerge branch 'setup_multiaccount' into setup_app_name
2013-10-22 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-21 David A. VelascoTrigger synchronization of current folder when the...
2013-10-21 David A. VelascoCheck changes in eTag of folders BEFORE requesting...
2013-10-18 masensioMerge branch 'setup_colors' into setup_app_name
2013-10-18 masensioMerge branch 'contact_settings' into setup_app_name
2013-10-18 masensioMerge branch 'setup_multiaccount' into setup_app_name
2013-10-18 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-18 masensioMerge branch 'setup_colors' into setup_app_name
2013-10-18 David A. VelascoFixed update of size in folders when browsing down...
2013-10-17 masensioMerge branch 'transifex' into setup_app_name
2013-10-17 masensioOC-1663: Replace references to app_name in code
2013-10-15 masensioMerge branch 'develop' into contact_settings
2013-10-14 David A. VelascoMerge remote-tracking branch 'origin/refresh_folder_con...
2013-10-14 David A. VelascoSome cleanup and methods renamed in FileDataStorageManager
2013-10-08 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-04 David A. VelascoClean up of synchronization code
2013-10-03 David A. VelascoMerge branch 'fixed_permanent_redirections' into refres...
2013-10-02 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-01 masensioMerge remote-tracking branch 'origin/develop' into...
2013-10-01 masensioOC-1508: App crashes when changing the orientation
2013-09-25 masensioOC-1230: app doesn't show the folders structure correct...
2013-09-24 David A. VelascoMerge pull request #234 from LukeOwncloud/develop
2013-09-20 masensioMerge branch 'develop' into refresh_folder_contents_whe...
2013-08-27 masensioMerge pull request #250 from owncloud/saml_based_federa...
2013-08-27 masensioMerge branch 'saml_based_federated_single_sign_on'...
2013-08-27 masensioOC-1079: Use isIdPRedirection
2013-08-27 masensioMerge branch 'saml_based_federated_single_sign_on'...
2013-08-27 masensioMerge branch 'saml_based_federated_single_sign_on'...
2013-08-26 masensioMerge branch 'master' into saml_based_federated_single_...
2013-08-23 David A. VelascoMerge branch 'saml_based_federated_single_sign_on'...
2013-08-23 masensioMerge branch 'saml_based_federated_single_sign_on'...
2013-08-23 David A. VelascoMerge branch 'saml_based_federated_single_sign_on'...
2013-08-22 David A. VelascoFixed condition to determine expiration of SAML SSO
2013-08-22 David A. VelascoMerge branch 'saml_based_federated_single_sign_on'...
2013-08-22 masensioMerge branch 'saml_based_federated_single_sign_on'...
2013-08-21 masensioOC-1029: add method isIdPRedirection
2013-08-16 masensioMerge branch 'saml_based_federated_single_sign_on'...
2013-08-14 David A. VelascoMerge remote-tracking branch 'origin/saml_based_federat...
2013-08-14 David A. VelascoMerge remote-tracking branch 'origin/saml_based_federat...
2013-08-12 David A. VelascoMerge branch 'saml_based_federated_single_sign_on'...
2013-08-12 David A. VelascoExpiration of SSO session is detected in background...
2013-07-16 masensioMerge branch 'master' into release-1.4.2
2013-07-11 masensioOC-673: Show folder size at a first sync
2013-07-10 masensioMerge pull request #215 from owncloud/branding_configur...
2013-07-10 David A. VelascoMerge branch 'master' into develop
2013-07-10 David A. VelascoMerge pull request #211 from owncloud/bug_folder_size_delay
2013-07-09 David A. VelascoMerge remote-tracking branch 'origin/bug_folder_size_de...
2013-07-09 David A. VelascoImprovements from comments
2013-07-09 masensioOC-576: method updateSubtreeSize in FileDataStorageMana...
2013-07-09 masensioOC-575: Update the size of a folder in DB during the...
2013-07-09 David A. VelascoImprovements from comments
2013-07-05 masensioOC-576: method updateSubtreeSize in FileDataStorageMana...
2013-07-05 David A. VelascoMerge branch 'develop' into branding_configurable_URL_i...
2013-07-05 David A. VelascoMerge branch 'master' into develop
2013-07-04 masensioOC-575: Update the size of a folder in DB during the...
2013-07-03 David A. VelascoMerge branch 'develop' into check_account_existance_in_...
2013-07-02 masensioMerge pull request #202 from owncloud/modify_password
2013-07-02 David A. VelascoMerge branch 'develop' into modify_password
2013-06-21 David A. VelascoRemoved toast message for updating credentials when...
2013-06-19 David A. VelascoMerge branch 'develop'after SPRINT-002
2013-06-06 masensioUpdate branch with develop branch
2013-05-06 David A. VelascoMerge branch 'develop' into file_browsing_refactoring
2013-05-03 David A. VelascoMerge branch 'develop' into fixForCrashedSharedContents
2013-05-03 David A. VelascoMerge pull request #152 from owncloud/oauth_login
2013-05-03 David A. VelascoMerge branch 'develop' into oauth_login
2013-04-25 David A. VelascoMerge branch 'develop' into oauth_login
2013-04-17 David A. VelascoCopyright note fixes
2013-04-15 David A. VelascoMerge pull request #118 from owncloud/loggingtool
2013-04-15 David A. VelascoMerge branch 'develop' into loggingtool
2013-04-04 David A. VelascoMerge branch 'develop' into feature_previews
2013-03-21 David A. VelascoOAuth clean-up and refactoring
2013-03-18 David A. VelascoRefresh authorization token on failed downloads / uploa...
2013-03-18 David A. VelascoMerge tag 'oc-android-1-3-22' into oauth_login
2013-03-18 David A. VelascoRefresh authorization token on failed synchronizations...
2013-03-14 David A. VelascoMerge pull request #90 from espenaf/master
2013-03-12 zerginatorThis wraps the android.util.logging into Log_OC which...
next