moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-17 06:55:03 -05:00
Code Issues Releases Wiki Activity
3,363 Commits 36 Branches 329 Tags 887 MiB
e938eefdd9
Commit Graph

3363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andrew Chen
a6fd17492c Fix XML errors in tr translation. 2012-08-07 11:22:59 -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
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
Andrew Chen
91d404350f IntelliJ IDEA: Use libs instead of direct jars; add ipr file. 
Switch to project libraries instead of direct module jar dependencies
so that we can bind source jars.  Add the IntelliJ IDEA ipr project
file in preparation for submodules.
 2012-08-02 13:46:04 -07:00
cketti
592ed3ef38 Upgrade from "keyguardPrivacy" to "notificationHideSubject" 
Make sure existing installations aren't reset to the default value when
the new setting can't be found.
 2012-08-02 03:09:26 +02:00
cketti
3e6d161c18 Show current value for the 'notification_hide_subject' ListPreference 2012-08-02 02:43:10 +02:00
cketti
8c11ec18a9 Code style/documentation cleanup (no functional changes) 2012-08-02 02:31:54 +02:00
cketti
cd37ae16e1 Fixed setting names in SettingsUpgrader for version 12 2012-08-02 02:20:33 +02:00
Bernhard Redl
4028505d69 Extended setting to hide subject in notification area (never, when locked, always) 
Fixed issue 2595
 2012-08-02 01:47:20 +02:00
cketti
f3e74d5321 Added support for "show in top group" to ChooseFolder 2012-08-01 23:44:40 +02:00
cketti
5ce0e192b5 Merge pull request #157 from monopatis/master 
Fixed some errors in the Greek translation
 2012-07-24 14:50:31 -07:00
Monopatis Dimitris
d1f84fc356 fix some spelling errors 2012-07-24 18:56:40 +03:00
Jesse Vincent
b15148662d Bumped manifest to 4.121 2012-07-22 11:09:24 -07:00
cketti
853b4681b2 Hide 'Background data' option on ICS+ devices 2012-07-19 05:25:23 +02:00
cketti
eb7f94a500 Hide "Show unread count" (notifications) on Honeycomb+ devices 
On Android 3.0 and newer the notification icon is no longer overlaid
with the 'notification number', so we hide the setting.
 2012-07-19 02:23:09 +02:00
cketti
5467a71cbf Added work-around for image loading bug in Android 4.0's WebView 
Fixes issue 3997
 2012-07-16 02:14:42 +02:00
cketti
b72fcd9d4b Only use the single-column layout on known good Android versions 
Fixes issue 3820
 2012-07-13 23:04:04 +02:00
cketti
83e57064ff Check database version after ending the transaction 2012-07-07 17:15:14 +02:00
cketti
d08169b004 Corrected indentation 2012-07-07 17:14:03 +02:00
cketti
400487b8aa Merge branch 'pullreq150' 2012-07-07 17:04:17 +02:00
cketti
e1d9a4779d Changed the rest of ImapStore to use longs for storing UIDs 2012-07-07 16:46:07 +02:00
cketti
2ad748fad7 Change ImapUtility to use 'long' for the values of sequence sets 2012-07-07 16:21:07 +02:00
cketti
a37c95b456 Move auto-unboxing out of if-clause 2012-07-07 15:41:55 +02:00
cketti
c359eb3cb7 Use auto-unboxing when iterating over a List<Long> 2012-07-07 15:36:43 +02:00
cketti
08c6c63b31 Merge branch 'pullreq153' 2012-07-07 15:06:41 +02:00