Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / SslUntrustedCertDialog.java
2015-07-06 masensioMerge branch 'release-1.7.2'
2015-06-22 David A. VelascoMerge branch 'master' into develop
2015-06-15 masensioMerge branch 'develop' into forbidden_characters_from_s...
2015-06-15 masensioMerge pull request #995 from owncloud/navigationDrawer_...
2015-06-15 masensioMerge remote-tracking branch 'origin/develop' into...
2015-06-15 David A. VelascoMerge branch 'develop' into navigationDrawer_basic
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com...
2015-05-27 masensioMerge branch 'remove_ActionBarSherlock' into navigation...
2015-05-27 masensioMerge branch 'develop' into remove_ActionBarSherlock
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-05-21 masensioMerge branch 'develop' into navigation_drawer
2015-05-18 masensioMerge branch 'develop' into navigation_drawer
2015-05-18 masensioRemove actionbarsherlock , replace it with Android...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1
2015-03-06 masensioMerge branch 'develop' into share_password_support
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license
2015-03-05 masensioUpdate year in license
2015-03-05 masensioAdd author's line in license
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-29 grecepMerge pull request #669 from grecep/master
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-24 jabarrosMerge branch 'thumbnails_from_server' of https://github...
2014-10-23 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-17 MMMarcyMerge remote-tracking branch 'theirs/develop' into...
2014-10-17 Magnus SjoqvistMerge with develop
2014-10-15 jabarrosMerge branch 'idn_hosts' of https://github.com/ogasser...
2014-10-09 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-06 jabarrosMerge branch 'master' of https://github.com/loripino21...
2014-10-01 Javier GonzalezMerge pull request #641 from owncloud/thumbnails_for_do...
2014-09-18 David A. VelascoMerge branch 'develop' into release-1.6.0
2014-09-18 David A. VelascoMerge pull request #627 from owncloud/better_loggin_system
2014-09-18 David A. VelascoFixed conflict - Merge branch 'develop' into better_log...
2014-09-17 jabarrosMerge branch 'develop' into better_loggin_system
2014-09-11 jabarrosMove Logger class to owncloud library and update refere...
2014-04-08 masensioMerge branch 'develop' into videoInstandUploads
2014-04-03 masensioMerge pull request #392 from pmarasse/pullup
2014-03-31 masensioMerge commit 'refs/pr/392' into improve_action_bar_pr_3...
2014-03-21 masensioMerge pull request #400 from tommyd3mdi/develop
2014-03-18 masensioMerge pull request #395 from dontcallmedom/master
2014-03-13 masensioMerge branch 'pr/400' into improve_notifications_pr_400...
2014-03-13 Thomas MüllerMerge branch 'develop' into introduce-travis-ci
2014-03-13 masensioMerge branch 'pr/395' into allow_multiline_checkbox_pre...
2014-03-12 masensioMerge pull request #437 from owncloud/check_server_cert...
2014-03-12 David A. VelascoFixed wrong reload of SAML web dialog after rotation...
2014-03-12 masensioMerge branch 'develop' into check_server_certificates_i...
2014-03-11 masensioMerge pull request #435 from owncloud/ssl_dialogs_refac...
2014-03-11 David A. VelascoSsl-error dialogs joint in a single one that uses diffe...
2014-03-11 masensioMerge branch 'develop' into check_server_certificates_i...
2014-03-10 masensioMerge branch 'develop' into check_server_certificates_i...
2014-03-10 masensioOC-3212: Show appropiate error messages for SslError...
2014-03-07 masensioMerge branch 'add_ssl_warning_dialog_for_devices_withou...
2014-03-07 masensioOC-3208: Unify both SSL dialogs taking information...
2014-03-07 David A. VelascoAdded new dialog for SSL errors showing information...
2014-03-07 masensioMerge branch 'develop' into check_server_certificates_i...
2014-03-06 masensioOC-3116: Add a warning dialog for untrusted SslCertific...