Commit graph

357 commits

Author SHA1 Message Date
cketti
82736f3a8b Merge pull request #524 from k9mail/merge_pgp_mime_branch
Merge changes from PGP/MIME repository
2015-01-02 22:04:28 +01:00
Jan Berkel
b0d401c3b7 Added note about expected method parameter format
8194c20ffe (commitcomment-9069167)
2014-12-22 22:37:17 +01:00
cketti
152e0a0530 Revert ImapStore URI change
Reverts changes introduced with commit 8194c20ffe
Adds test to make sure usernames/passwords with special characters encode/decode properly.
2014-12-22 18:24:22 +01:00
Jan Berkel
8194c20ffe Fix IMAP uri decode when user/pw contains ':' 2014-12-21 11:52:05 +01:00
cketti
4f8fc5bc5b Merge remote-tracking branch 'k9mail_pgp_mime/master'
Fixed lots of conflicts
2014-12-20 08:07:46 +01:00
cketti
7752f42db6 Merge branch 'gradle_only_and_k9mail_library'
Conflicts:
	k9mail-library/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java
	src/com/fsck/k9/mail/store/imap/ImapSettings.java
	src/com/fsck/k9/mail/transport/imap/ImapSettings.java
2014-12-20 04:46:14 +01:00
cketti
105bca735b Move 'mail' package to library project 2014-12-20 01:31:33 +01:00