moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-16 22:45:04 -05:00
Code Issues Releases Wiki Activity
3,385 Commits 36 Branches 329 Tags 887 MiB
756847619b
Commit Graph

3385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ashley willis
756847619b Merge commit '4.301' into issue-162-new 
Conflicts:
	AndroidManifest.xml
	res/values-fi/strings.xml
	res/values-it/strings.xml
	src/com/fsck/k9/activity/MessageList.java
 2012-09-11 02:00:27 -05:00
ashley willis
e938eefdd9 Merge commit '4.191' into issue-162-new 2012-09-11 01:51:16 -05:00
ashley willis
f57ee1181f Merge commit '4.121' into issue-162-new 
Conflicts:
	src/com/fsck/k9/mail/store/LocalStore.java
 2012-09-11 01:50:46 -05:00
ashley willis
d89db55995 Merge commit '4.120' into issue-162-new 2012-09-11 01:29:42 -05:00
ashley willis
b1fb8655da Merge commit '4.119' into issue-162-new 
Conflicts:
	build.xml
	res/values/strings.xml
	res/xml/global_preferences.xml
 2012-09-11 01:29:31 -05:00
ashley willis
fe0088bed3 Merge commit '4.118' into issue-162-new 
Conflicts:
	src/com/fsck/k9/K9.java

trivial conflict.

removed duplicate javadoc entry in build.xml
 2012-09-11 01:24:11 -05:00
ashley willis
83fb5b5c9a Merge commit '4.117' into issue-162-new 2012-09-11 01:20:56 -05:00
ashley willis
b9c83aefe6 Merge commit '4.116' into issue-162-new 
Conflicts:
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/FolderSettings.java
 2012-09-11 01:20:38 -05:00
ashley willis
b6df5c908b Merge commit '4.115' into issue-162-new 
Conflicts:
	src/com/fsck/k9/K9.java

trivial conflict.
 2012-09-11 01:13:01 -05:00
ashley willis
5b772ef171 Merge commit '4.114' into issue-162-new 
Conflicts:
	src/com/fsck/k9/K9.java
	src/com/fsck/k9/activity/MessageView.java

enabled isCopyCapable in src/com/fsck/k9/controller/MessagingController.java
 2012-09-11 01:09:08 -05:00
ashley willis
a5d0e44711 Merge commit '4.113' into issue-162-new 
Conflicts:
	src/com/fsck/k9/activity/ChooseFolder.java
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/mail/store/ImapStore.java
	src/com/fsck/k9/view/MessageHeader.java

I hacked on src/com/fsck/k9/controller/MessagingController.java and perhaps broke uidplus support,
but things run fine in my simple tests.
 2012-09-11 00:56:06 -05:00
ashley willis
47b6eee6df Merge commit '4.112' into issue-162-new 2012-09-10 23:40:39 -05:00
ashley willis
a62a5babca Merge commit '4.110' into issue-162-new 
Conflicts:
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/AccountSettings.java

Resolutions:
    controller/MessagingController.java:
        public boolean isMoveCapable(final Account account)
        public boolean isMoveCapable(Message message)

    activity/setup/AccountSettings.java:
        private boolean mIsMoveCapable = false; // ASH i seem to have removed this, or renamed it to mIsAppendCapable
 2012-09-10 23:38:13 -05:00
Jesse Vincent
5b4d2806ab Bumped manifest to 4.301 2012-08-16 10:56:37 -07:00
Jesse Vincent
5b9c9858c1 bump version codes to not conflict with 4.2 2012-08-16 10:56:18 -07:00
Andrew Chen
4ea1aaeb10 Add new Mime4J libraries to IntelliJ IDEA classpath. 2012-08-15 15:35:43 -07:00
Andrew Chen
a274a3717a Merge pull request #168 from aatdark/aatdark_mime4j072 
upgraded Mime4J from 0.7-SNAPSHOT to 0.7.2.  Fixes MimeMultipart parser bug (Issue 4455).
 2012-08-15 15:34:25 -07:00
Jani Kinnunen
8e6a880032 Update Finnish translation. 2012-08-15 11:16:39 -07:00
Koji Arai
9a9dbd7ba3 Updated Japanese translation. catch up with 2e454f0. 2012-08-15 23:00:05 +09:00
cketti
66911a0624 Use grey background for read messages in the message list 2012-08-15 04:14:12 +02:00
Bernhard Redl
89f6c2f6d0 upgraded Mime4J 0.7-SNAPSHOT -> 0.7.2 (fixes MimeMultipart parser bug) 2012-08-15 01:47:57 +02:00
cketti
2e454f0af7 Removed "System zoom controls" setting 
We always allow zooming but hide (provided the Android version supports
it) the on-screen zoom controls if the device supports multi-touch,
hence pinch-to-zoom.
 2012-08-15 00:21:22 +02:00
cketti
3f426c824c Fixed typo 2012-08-13 20:05:19 +02:00
cketti
03f0678047 Use TitleBarDelegate otherwise clicking links won't work on Jelly Bean 2012-08-13 16:12:15 +02:00
cketti
8d3a1cdc77 Updated German translation 2012-08-11 01:58:21 +02:00
cketti
ba6a0bfa95 Added placeholders for missing strings to translations 2012-08-11 01:54:09 +02:00
cketti
d9f1690741 Added option to always show the CC/BCC text input fields 2012-08-10 03:38:10 +02:00
cketti
1ff3b6b88f Disable the 'Add Cc/Bcc' menu option when both fields are visible 2012-08-10 02:31:55 +02:00
Jesse Vincent
1fe9bab851 Bumped manifest to 4.191 2012-08-09 15:56:49 -07:00
Jani Kinnunen
ce318e4378 Updated Finnish translation from pull #166. 
Squashed commit of the following:

commit 86e704e7a66fe0979885ee677e2b7cf3451567ce
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Thu Aug 9 06:49:07 2012 +0300

    Another try at correcting the WebDAV thing.

commit 5e02bad5216af6e285b8446efd9262a010f9bcbe
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Wed Aug 8 20:51:21 2012 +0300

    Small corrections to the Finnish translation.

commit 47cb79e1e007f762bc7e870d619558baea43f1cf
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Wed Aug 8 09:18:06 2012 +0300

    Updated Finnish translation
 2012-08-09 10:22:28 -07:00
Federico
992fc08ecb Update Values-it 
A few fixes by achen.code.  Resolves pull #167.
 2012-08-09 10:22:23 -07:00
Federico
513ce39851 Update values-it/string.xml 2012-08-09 10:22:02 -07:00
Jani Kinnunen
ff6bae0eef Updated Finnish translation from pull #166. 
Squashed commit of the following:

commit 86e704e7a66fe0979885ee677e2b7cf3451567ce
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Thu Aug 9 06:49:07 2012 +0300

    Another try at correcting the WebDAV thing.

commit 5e02bad5216af6e285b8446efd9262a010f9bcbe
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Wed Aug 8 20:51:21 2012 +0300

    Small corrections to the Finnish translation.

commit 47cb79e1e007f762bc7e870d619558baea43f1cf
Author: Jani Kinnunen <jani.kinnunen@wippies.fi>
Date:   Wed Aug 8 09:18:06 2012 +0300

    Updated Finnish translation
 2012-08-09 10:19:36 -07:00
Federico
4a66e95d60 Update Values-it 
A few fixes by achen.code.  Resolves pull #167.
 2012-08-08 14:59:30 -07:00
Andrew Chen
6f8c60763d Use Calendar to get current year when formatting copyright. 2012-08-08 11:03:10 -07:00
Andrew Chen
5804b617b6 Merge pull request #165 from Votyer/master 
Update it translation.
 2012-08-08 09:46:56 -07:00
Andrew Chen
a6fd17492c Fix XML errors in tr translation. 2012-08-07 11:22:59 -07:00
Andrew Chen
20e358d60b Fix XML errors in tr translation. 2012-08-07 11:19:23 -07:00
Jesse Vincent
2338c64ee8 bump version to 4.190 as we prep for 4.2 2012-08-07 11:15:43 -07:00
Andrew Chen
827d0be277 Merge pull request #164 from wakeup/patch-3 
Update tr translation.
 2012-08-07 11:06:04 -07:00
Federico
806a7e4eed Update values-it/string.xml 2012-08-07 10:00:59 -07:00
wakeup
0a0a9b83f9 Update res/values-tr/strings.xml 2012-08-07 18:43:22 +03:00
Andrew Chen
d370acb67d fix formatting 2012-08-06 17:08:49 -07:00
Andrew Chen
4f122ca094 Merge pull request #160 from dzan/fix_messagelist_whitespace 
No more white space at the right hand side of the MessageList
 2012-08-06 16:53:55 -07:00
cketti
e08b5d2edf Make the setEmbeddedTitleBar fall-back work on pre-API16, too 2012-08-04 01:13:38 +02:00
cketti
de6d271d58 Remove JBTitleBarWebView because TitleBarWebView handles all versions 2012-08-04 00:16:06 +02:00
Sander Bogaert
ee283c0c77 Give star a bit more room so there is no cut-off. Don't force the scrollbar on the outside so the listitems can take the whole width. 2012-08-03 12:18:12 -04:00
Jesse Vincent
a80d7c518a Always recalculate 2012-08-02 16:58:13 -07:00
Jesse Vincent
74f04e75e3 A first spike of integrating http://code.google.com/p/android-titlebar-webview 
on my nexus 7, the webview and titlebar are overlapping each other, still
 2012-08-02 16:49:21 -07:00
Jesse Vincent
17a6f79365 Better solution coming up! 
Revert "Added fallback for when WebView.setEmbeddedTitleBar() is not available"

This reverts commit 6073b9d3fa.
 2012-08-02 16:11:10 -07:00