Merge pull request #955 from owncloud/thumbnailOOM
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / adapter / SslErrorViewAdapter.java
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-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
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 masensioRemove some import warnings
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...