• Arturo Jiménez 's avatar
    Updated with last stable version of k9 · 86e68665
    Arturo Jiménez authored
    There are problems to fix with color shown in the toolbar and the status bar
    
    Merge branch 'develop' into feature/material-toolbar-pep-activities
    
    Conflicts:
    	build.gradle
    	gradle/wrapper/gradle-wrapper.jar
    	gradle/wrapper/gradle-wrapper.properties
    	gradlew
    	gradlew.bat
    	k9mail-library/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
    	k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java
    	k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
    	k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java
    	k9mail/build.gradle
    	k9mail/src/fDroid/res/values/strings.xml
    	k9mail/src/main/AndroidManifest.xml
    	k9mail/src/main/java/com/fsck/k9/K9.java
    	k9mail/src/main/java/com/fsck/k9/account/AndroidAccountOAuth2TokenStore.java
    	k9mail/src/main/java/com/fsck/k9/activity/Accounts.java
    	k9mail/src/main/java/com/fsck/k9/activity/FolderList.java
    	k9mail/src/main/java/com/fsck/k9/activity/K9Activity.java
    	k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java
    	k9mail/src/main/java/com/fsck/k9/activity/K9ListActivity.java
    	k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
    	k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
    	k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.java
    	k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSettings.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
    	k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java
    	k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
    	k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
    	k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentViewInfo.java
    	k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
    	k9mail/src/main/java/com/fsck/k9/mailstore/LocalStore.java
    	k9mail/src/main/java/com/fsck/k9/message/MessageBuilder.java
    	k9mail/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
    	k9mail/src/main/java/com/fsck/k9/pEp/PEpMessageBuilder.java
    	k9mail/src/main/java/com/fsck/k9/pEp/PEpProvider.java
    	k9mail/src/main/java/com/fsck/k9/pEp/PEpProviderImpl.java
    	k9mail/src/main/java/com/fsck/k9/pEp/PEpUtils.java
    	k9mail/src/main/java/com/fsck/k9/pEp/PePUIArtefactCache.java
    	k9mail/src/main/java/com/fsck/k9/pEp/models/mappers/PEpIdentityMapper.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/PEpContactBadge.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/PepColoredActivity.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/adapters/PEpIdentitiesAdapter.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/blacklist/KeysAdapter.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/blacklist/PepBlacklist.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/privacy/status/PEpStatus.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/privacy/status/PEpStatusPresenter.java
    	k9mail/src/main/java/com/fsck/k9/pEp/ui/privacy/status/PEpTrustwords.java
    	k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
    	k9mail/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
    	k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
    	k9mail/src/main/java/com/fsck/k9/view/MessageHeader.java
    	k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java
    	k9mail/src/main/res/drawable/status_lock_closed.xml
    	k9mail/src/main/res/layout-land/actionbar_custom.xml
    	k9mail/src/main/res/layout/account_setup_basics.xml
    	k9mail/src/main/res/layout/actionbar_custom.xml
    	k9mail/src/main/res/layout/message_crypto_status_view.xml
    	k9mail/src/main/res/layout/message_list_item.xml
    	k9mail/src/main/res/layout/pep_blacklist.xml
    	k9mail/src/main/res/layout/pep_recipient_row.xml
    	k9mail/src/main/res/layout/pep_status.xml
    	k9mail/src/main/res/layout/pep_trustwords.xml
    	k9mail/src/main/res/layout/pep_trustwords_view.xml
    	k9mail/src/main/res/layout/recipient_token_item.xml
    	k9mail/src/main/res/layout/toolbar.xml
    	k9mail/src/main/res/menu/menu_pep_status.xml
    	k9mail/src/main/res/menu/message_compose_option.xml
    	k9mail/src/main/res/values-es/pep_strings.xml
    	k9mail/src/main/res/values-es/strings.xml
    	k9mail/src/main/res/values-iw/strings.xml
    	k9mail/src/main/res/values-ja/strings.xml
    	k9mail/src/main/res/values-nb/strings.xml
    	k9mail/src/main/res/values-nl/strings.xml
    	k9mail/src/main/res/values-pl/strings.xml
    	k9mail/src/main/res/values-pt-rBR/strings.xml
    	k9mail/src/main/res/values-sk/strings.xml
    	k9mail/src/main/res/values-sr/strings.xml
    	k9mail/src/main/res/values-sv/strings.xml
    	k9mail/src/main/res/values-uk/strings.xml
    	k9mail/src/main/res/values-zh-rCN/strings.xml
    	k9mail/src/main/res/values/colors.xml
    	k9mail/src/main/res/values/pep_strings.xml
    	k9mail/src/main/res/values/strings.xml
    	k9mail/src/main/res/values/styles.xml
    	k9mail/src/main/res/values/themes.xml
    	k9mail/src/main/res/xml/account_settings_preferences.xml
    	k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java
    	settings.gradle
    86e68665
Name
Last commit
Last update
..
drawable-src Loading commit data...
drawables-pgp Loading commit data...
K-9_Mail.ai Loading commit data...
K-9_Mail.eps Loading commit data...
K-9_Mail.svg Loading commit data...
K-9_Mail_512x512.png Loading commit data...
feature_graphic.png Loading commit data...
feature_graphic.svg Loading commit data...
show_more_indicator.svg Loading commit data...