Commit Graph

606 Commits

Author SHA1 Message Date
RiseT
e3da0ac908 Make 'Disappears' in message details translatable
Fixes #5755
Closes #5756

// FREEBIE
2016-10-07 10:42:05 -07:00
Moxie Marlinspike
2b4d41de03 Safety number string fixes
// FREEBIE
2016-09-25 19:50:03 -07:00
RiseT
8fe96fc1b7 String improvement: Blocking and unblocking contacts
This fixes/improves several strings related to blocking and unblocking
contacts regarding:

- Wording consistency
- Compliance with Google's Design Guidelines
- Clarity

Closes #5696
// FREEBIE
2016-09-25 14:55:03 -07:00
RiseT
33a79dde06 Fix string: Adding group members
This changes the string "Add member" to "Add members" as the
corresponding list is multi-selectable.

Closes #5697
// FREEBIE
2016-09-25 14:51:21 -07:00
Moxie Marlinspike
848a25664b Make fingerprint changes optionally non-blocking
Also complete the rename from "identity" to "safety numbers."

// FREEBIE
2016-09-25 14:27:40 -07:00
Moxie Marlinspike
852634b294 Support for updated fingerprint format
// FREEBIE
2016-09-25 14:23:52 -07:00
Christian Ascheberg
e1b24ab878 Fix display of secure session reset records
Fixes #5605
Closes #5680

// FREEBIE
2016-09-14 16:37:28 -07:00
Christian Ascheberg
40332f57ad improve invite strings
Fixes #4869
Closes #5393
//FREEBIE
2016-09-01 10:44:45 -07:00
FeuRenard
a370f086c0 Respect privacy settings on ticker content for Android <5
Fixes #5517
Closes #5592

// FREEBIE
2016-08-31 18:44:15 -07:00
FeuRenard
5bf1707d60 Catch ActivityNotFoundExceptions
Fixes #3726
Closes #5617
// FREEBIE
2016-08-31 18:17:15 -07:00
Moxie Marlinspike
d7e4928f22 Support for disappearing messages
// FREEBIE
2016-08-28 17:03:23 -07:00
McLoo
fd43dbdcdb Be more specific when toasting "Success!"
Closes #4871
//FREEBIE
2016-03-09 15:58:26 -08:00
RiseT
ff1a5a5197 'Devices' & 'Manage linked devices' -> 'Linked devices'
Fixes #5201
Closes #5213
// FREEBIE
2016-03-09 14:05:16 -08:00
haffenloher
bd1dc37bab Clarify "SMS import complete" notification text
Fixes #5262
Closes #5274

// FREEBIE
2016-03-09 13:47:17 -08:00
Geonu Kang
ba960a82e2 Extract compose subhint for SIM name to string resource
Fixes #5304
Closes #5305
// FREEBIE
2016-03-02 12:46:59 -08:00
haffenloher
25d7931358 Make system database import notification translatable
Also replace "TextSecure" with "Signal" in the notification text.

Closes #5256
// FREEBIE
2016-02-18 17:52:41 -08:00
Andreas Fehn
238471b847 Allow saving all attachments of a thread
Closes #3975
2016-02-18 17:52:01 -08:00
Moxie Marlinspike
0d6b2d899e Fix broken strings
Fixes #5218
// FREEBIE
2016-02-18 17:52:01 -08:00
RiseT
12957d96e0 Improve identity key scanning strings
Closes #5218
Fixes #1481
// FREEBIE
2016-02-18 17:52:01 -08:00
Moxie Marlinspike
6da86e482d Support for dual-sim SMS/MMS functionality
Allow source selection for sending SMS/MMS, and display the
SIM that received SMS/MMS.

Fixes #555
Closes #5199
// FREEBIE
2016-02-09 16:53:15 -08:00
Jani Monoses
847142d0f6 No need for capitalization in page title.
Closes #5097
// FREEBIE
2016-01-27 12:22:30 -08:00
2-4601
058585bf81 Fix five strings
Fixes
- one ambiguous pronoun
- one remaining reference of ambiguous 'lock screen'
- three cases of 'click' -> 'tap'

And gets rid of unnecessary line breaks in two strings.

Closes #5095
// FREEBIE
2016-01-27 12:21:32 -08:00
Geonu Kang
999a7431ac Make debug log strings more consistent
Fixes #5083
Closes #5087
// FREEBIE
2016-01-27 12:17:43 -08:00
Moxie Marlinspike
759f9d8016 Support for location drafts
Fixes #4979
// FREEBIE
2016-01-04 13:02:22 -08:00
Moxie Marlinspike
bcf95e50aa Support for location messages
Start with encoding as a simple image thumbnail for compatibility
with MMS and iOS

// FREEBIE
2015-12-24 07:47:25 -08:00
agrajaghh
4fa6680f83 RTL support
Closes #4916
Fixes #4714
2015-12-24 07:47:25 -08:00
Christian Ascheberg
fd570310e0 fix more plurals
Closes #4898
// FREEBIE
2015-12-24 07:47:25 -08:00
agrajaghh
ed592950c0 setting to disable notifications for new contacts
also mute these notifications between 23:00 and 09:00

fixes #4572
Closes #4926
2015-12-24 07:47:25 -08:00
RiseT
d238e2bbc5 Wording: Improve some strings in Privacy preferences
Closes #4907
Fixes #4651
// FREEBIE
2015-12-24 07:47:25 -08:00
Christian Ascheberg
08b61572e9 fix some plurals
Closes #4815
Fixes #4811
// FREEBIE
2015-12-10 05:04:03 -08:00
Christian Ascheberg
4696837f2f warn user before build expires
Closes #4322
// FREEBIE
2015-12-10 05:04:03 -08:00
RiseT
307578eb18 Wording ambiguity: Archived conversation -> Conversation archived
Closes #4802
// FREEBIE
2015-12-10 05:04:03 -08:00
Moxie Marlinspike
73acd1f3a2 Take people into Signal when they attempt to link w/ 3rd party scan
// FREEBIE
2015-12-03 14:39:13 -08:00
Geonu Kang
afb21203b7 Extract "Today" in device list item to string resource
Related to #4752
Closes #4780
// FREEBIE
2015-12-02 09:36:32 -08:00
Geonu Kang
29f4f269fc Make "New Message!" notification string more consistent with guidelines
Fixes #4758
Closes #4759
// FREEBIE
2015-12-02 09:33:23 -08:00
RiseT
65176c940e Wording consistency: thread -> conversation
Closes #4753
// FREEBIE
2015-12-02 09:31:56 -08:00
Geonu Kang
591ee92e45 Add string resource for unarchive button title
Fixes #4747
Closes #4748
// FREEBIE
2015-12-02 09:30:29 -08:00
clashman
24360bf5b6 Remove unnecessary capitalizations
Closes #4739
// FREEBIE
2015-12-02 09:26:43 -08:00
Geonu Kang
3319748926 Signal-ize last remaining "data channel" and "push" string resources
Fixes #4730
Closes #4731
// FREEBIE
2015-11-27 13:00:21 -08:00
Moxie Marlinspike
2ab0029d49 Support for archive actions
Fixes #1141
Closes #4698
// FREEBIE
2015-11-27 12:45:23 -08:00
char32
796decdb0f Switch from 'Contents Hidden' to 'New message'
Fixes #4004
Closes #4566
2015-11-26 08:07:31 -08:00
Jani Monoses
ec58132b25 No need for capitalization in dialog title.
Closes #4713
// FREEBIE
2015-11-26 07:28:36 -08:00
Geonu Kang
563f7e6e78 Make strings more consistent, "3G" -> "mobile data"
Fixes #4720
Closes #4721
// FREEBIE
2015-11-26 07:26:09 -08:00
Moxie Marlinspike
2ef808f406 Add help menu to conversation list overflow
Fixes #4552
// FREEBIE
2015-11-26 07:24:56 -08:00
Moxie Marlinspike
9b3457f0b2 Don't choke so hard on random QR codes
Fixes #4642
// FREEBIE
2015-11-22 09:28:36 -08:00
Moxie Marlinspike
dc1b420fef Voice Note -> Voice Message
Fixes #4628
// FREEBIE
2015-11-20 10:25:08 -08:00
Geonu Kang
d9467ef3c5 Extract "Devices" preference category title to string resource
Fixes #4621
// FREEBIE
2015-11-20 13:50:31 +09:00
Geonu Kang
d5bf1b6137 Fix "Repeat new passphrase" spelling
Fixes #4617
// FREEBIE
2015-11-20 11:06:41 +09:00
Moxie Marlinspike
bfe4ad6c34 Voice notes
Closes #4610
Closes #3563
// FREEBIE
2015-11-19 17:37:48 -08:00
Moxie Marlinspike
7c0bf0c871 Device provisioning
Closes #4553
// FREEBIE
2015-11-19 11:30:39 -08:00
agrajaghh
6a99c6c4ac Fix "Silent" summary for ringtone preference
fixes #3962
Closes #4441

//FREEBIE
2015-11-19 11:13:24 -08:00
agrajaghh
a65ade5366 add action buttons to the call notification
fixes #4160
Closes #4490
2015-11-19 11:12:15 -08:00
Geonu Kang
1323b49c57 Use separate menu title strings for insecure/secure calls
Fixes #4579
Closes #4580
// FREEBIE
2015-11-19 11:02:29 -08:00
Jake McGinty
25da3525fa use material labels for passphrase text
closes #3374
Closes #4570
// FREEBIE
2015-11-19 10:57:49 -08:00
Jake McGinty
2ce2a0d5c3 add refresh in overflow to NewConversationActivity
fixes #4470
closes #4564
// FREEBIE
2015-11-19 10:47:42 -08:00
Christian Ascheberg
1d8aef1669 Plural group join message
Closes #4535
Fixes #4521
// FREEBIE
2015-11-19 10:40:57 -08:00
Geonu Kang
cca38ddf3f Improve Delete Thread, Reset Secure Session confirmation dialogs
Fixes #4512
Closes #4513
// FREEBIE
2015-11-19 10:35:45 -08:00
Sam Lanning
66578a2c76 Change notification privacy setting wording
"Neither" -> "No name or message"

fixes #3903
closes #3966

// FREEBIE
2015-11-19 10:30:26 -08:00
McLoo
6c20a4c08b Change 'Title' to 'Group name' in group update message
closes #3424
//FREEBIE
2015-11-19 10:30:26 -08:00
Jake McGinty
d3000f384f adhere to android plural standards
// FREEBIE

Closes #4503
2015-11-12 15:20:17 -08:00
Jake McGinty
76b0183e0f move db query off main thread, fix group self-add
fixes #4168
Closes #4502
// FREEBIE
2015-11-12 15:20:17 -08:00
Moxie Marlinspike
7bec5efe1a Add 'Signal Call' option to contact card
Fixes #4392
Closes #4465
// FREEBIE
2015-11-12 15:20:16 -08:00
agrajaghh
5c59c3f423 make invite strings plural
fixes #4388
Closes #4389

// FREEBIE
2015-11-12 15:20:16 -08:00
Sebastian Morr
181c7dfd85 Add the option to mute notifications for one year.
Fixes #4448.
Closes #4454
2015-11-12 15:20:16 -08:00
RiseT
e1f9519235 Replace 'my' with 'your'
See
https://www.google.com/design/spec/style/writing.html#writing-language

// FREEBIE
2015-11-12 15:20:16 -08:00
RiseT
7f0b0803bc Change 'SD card' to 'storage' & cosmetic corrections
Fixes #3920
2015-11-12 15:20:16 -08:00
Moxie Marlinspike
be0ca330f5 Nicer looking attachment type selector
Closes #4367
// FREEBIE
2015-11-04 17:56:21 -08:00
Manuel Geier
328a3ff20e show total number of messages or threads to be deleted
in delete-confirm-dialogs

Closes #4284

// FREEBIE
2015-11-04 17:56:20 -08:00
Jake McGinty
3e798a9863 batch invitation
// FREEBIE
2015-11-04 17:56:20 -08:00
Moxie Marlinspike
8d82033855 Notify when contacts join Signal
Closes #4314
// FREEBIE
2015-11-04 17:56:20 -08:00
RiseT
08be47c03e Adjust a couple of strings in order to include calls AND messages.
Closes #4311
2015-11-04 17:56:20 -08:00
RiseT
13bd3c773c Make some 'notification sound' strings consistent with the rest
Closes #4324
// FREEBIE
2015-11-04 17:56:20 -08:00
Geonu Kang
ea4def7ea1 Change string "Load" to "See"
Fixes #4304
Closes #4305
// FREEBIE
2015-10-26 12:26:21 -07:00
Jake McGinty
285bd3de0e tweak reminder jedi mind tricks
// FREEBIE
2015-10-26 12:24:53 -07:00
Moxie Marlinspike
3453aadcfd Revert "Change string "Load" to "See""
This reverts commit 7a0765c1c2.
2015-10-26 11:45:28 -07:00
Geonu Kang
7a0765c1c2 Change string "Load" to "See"
Fixes #4304
Closes #4305
// FREEBIE
2015-10-26 11:42:12 -07:00
Sam Lanning
c342f0d7e4 Change text of dialog box confirming blocking.
Blocking users now also blocks incoming calls, so the block confirmation
message has been updated.

fixes #4217
Closes #4295

// FREEBIE
2015-10-24 11:04:10 -07:00
Moxie Marlinspike
5111fe2e95 Display thumbnail previews for images in conversation list.
Closes #4262
// FREEBIE
2015-10-22 10:45:04 -07:00
Jake McGinty
4ffb1ea95e in-conversation invite reminder
Closes #4250
// FREEBIE
2015-10-15 13:23:37 -07:00
Bastelbursche
38d0b5caa8 Remove unused strings with "session"
Closes #4208
2015-10-15 11:34:13 -07:00
Jake McGinty
ae97495c47 only load partial conversation by default
Closes #4252
Fixes #3911
// FREEBIE
2015-10-15 11:16:49 -07:00
Moxie Marlinspike
143f786322 Extern Incoming call string.
Fixes #4196
// FREEBIE
2015-10-04 17:41:23 -07:00
Geonu Kang
a0859a71b2 Make 'reset secure session' consistent
Closes #4200
Fixes #4198
// FREEBIE
2015-10-04 10:24:21 -07:00
Moxie Marlinspike
26f8870344 server failed -> network failed
// FREEBIE
2015-10-02 13:37:16 -07:00
Moxie Marlinspike
e0ebe6c858 Switch up thread record strings
// FREEBIE
2015-10-01 18:01:15 -07:00
Moxie Marlinspike
77d73fa572 Correctly display call actions in thread list
Fixes #4170
// FREEBIE
2015-10-01 17:27:22 -07:00
Moxie Marlinspike
ff1f190110 Rename some strings
// FREEBIE
2015-10-01 12:47:13 -07:00
Moxie Marlinspike
c6abb7dc64 Switch recipient preference from Rington -> Notification tone
// FREEBIE
2015-10-01 12:22:17 -07:00
Moxie Marlinspike
003787e4a6 Externalize missing strings.
Fixes #4158
// FREEBIE
2015-10-01 10:27:20 -07:00
Brinly Taylor
0d05a2bf09 Signal: Clarify a string.
Closes #4157
// FREEBIE
2015-10-01 10:19:03 -07:00
Jake McGinty
3035dc4df9 Experience upgrade splash screen.
Behaves similarly to the DatabaseUpgradeActivity. You have a
static list of ExperienceUpgrade models that include a "trigger"
version, where when a user upgrades through it a notification
will appear, and there will be a splash explanation screen.

Right now the splash screens are basic and not too configurable,
but that can be reworked as upgrades demand.

Closes #4151
2015-09-30 18:29:54 -07:00
Moxie Marlinspike
31e20ca87e Distinguish between secure and insecure call in conversation menu.
// FREEBIE
2015-09-30 14:30:11 -07:00
Moxie Marlinspike
123c7b2119 Extract RedPhone string resources
// FREEBIE
2015-09-30 14:30:11 -07:00
Moxie Marlinspike
a0fc948519 Menu should be 'reset secure session,' since it'll never end.
// FREEBIE
2015-09-30 14:30:10 -07:00
Moxie Marlinspike
4044da849e Replace all strings containing 'TextSecure' with 'Signal'
// FREEBIE
2015-09-30 14:30:10 -07:00
Jake McGinty
92b2da0286 download control details
Closes #4063
// FREEBIE
2015-09-17 12:51:57 -07:00
Jake McGinty
e077cc6581 advanced pref to use android emoji
// FREEBIE
2015-09-17 12:20:25 -07:00
Jake McGinty
551274f167 Large attachment support
Closes #4019
// FREEBIE
2015-09-17 12:20:25 -07:00
Jake McGinty
aaf3d6a7c7 media download controls i18n
fixes #4015
// FREEBIE
2015-09-04 12:11:06 -07:00
Jake McGinty
80ce83ef9d Media download controls
Closes #3991
// FREEBIE
2015-09-03 11:40:55 -07:00
RiseT
f693a04531 Preferences Message Notifications Description
// FREEBIE
Closes #3871
2015-08-05 13:11:13 -07:00
Moxie Marlinspike
120cde9917 Support for notification privacy settings.
// FREEBIE
2015-08-05 13:06:37 -07:00
Geonu Kang
278214ef86 Improve multi-device strings consistency
Fixes #3830
Closes #3840
// FREEBIE
2015-07-30 10:15:50 -07:00
Jake McGinty
a84dcf6a8e assert gif size constraints before OOMEs
fixes #3778
closes #3833
// FREEBIE
2015-07-29 16:17:27 -07:00
agrajaghh
e2e5aa32a8 fix icon for "Take Photo" in the attachment dialog and
also change "Take Photo" to "Camera"

fixes #3819
closes #3820

// FREEBIE
2015-07-29 16:17:27 -07:00
Moxie Marlinspike
dcc7ba20e6 Update disable passphrase strings.
Fixes #3705
// FREEBIE
2015-07-20 16:58:08 -07:00
agrajaghh
cfc9514f89 make "Enter name or number" translateable
Fixes #3703
Closes #3708

// FREEBIE
2015-07-20 16:09:10 -07:00
Moxie Marlinspike
0e7fcc6893 Extract string resource.
// FREEBIE
2015-07-16 11:15:56 -07:00
Moxie Marlinspike
8d9ae731ef Only use MasterSecret for local message encryption.
Not for the axolotl store.

// FREEBIE
2015-07-16 11:15:56 -07:00
Jake McGinty
c4524ebbd1 Revert the "Send via TextSecure" string change
// FREEBIE
2015-07-08 17:22:51 -07:00
Jake McGinty
54a37cc658 refactor direct capture
Closes #3516
// FREEBIE
2015-07-08 16:02:39 -07:00
Calvin Hu
c4a37e38ab Add camera preview to message composition 2015-07-08 16:01:57 -07:00
Moxie Marlinspike
13eed3baa7 Fix up wearable reply stuff a little.
1) Don't include MasterSecret in PendingIntents.

2) Correctly reply to non-push group threads, rather than
   just an individual in that group.

// FREEBIE
2015-07-08 13:13:49 -07:00
Christoph Haefner
f0b2cc5590 Added WearReplyReceiver 2015-07-08 12:55:46 -07:00
Moxie Marlinspike
69e1252f7f Add "conversation settings" menu option in conversation activity.
Closes #3399
Fixes #3399
// FREEBIE
2015-07-08 12:22:51 -07:00
Jake McGinty
59c51127f6 add twilio shoutout to registration
// FREEBIE
2015-07-02 12:20:51 -07:00
McLoo
3a9ceb8371 Move ellipse from title to message and complete ellipse
Closes #3481
//FREEBIE
2015-07-01 14:07:40 -07:00
Moxie Marlinspike
7cdc26a8ba Shorten "mark as read" to "mark read" to make room in notification
// FREEBIE
2015-07-01 08:23:43 -07:00
Moxie Marlinspike
296796eb54 User-selectable contact colors.
// FREEBIE
2015-06-27 19:43:18 -07:00
Moxie Marlinspike
bf3c1d3745 Support for device management, limits, and contact requests.
// FREEBIE
2015-06-24 18:30:55 -07:00
Moxie Marlinspike
2016fa315b Support for quick reply from notifications.
Fixes #483
Closes #3455
// FREEBIE
2015-06-24 18:30:55 -07:00
Moxie Marlinspike
dc60c011a6 Support "quick response" when TextSecure is unlocked.
Fixes #299
Closes #3456
// FREEBIE
2015-06-24 18:30:55 -07:00
agrajaghh
5116c61f43 Translate strings in RecipientPreferenceActivity
Fixes #3405
Closes #3409

 // FREEBIE
2015-06-12 09:15:42 -07:00
agrajaghh
687beda478 Set ActionBar title to "Privacy"
Fixes #3406
Closes #3410

// FREEBIE
2015-06-12 09:14:35 -07:00
Moxie Marlinspike
40af2a81db Support for per-recipient muting, blocking, and ringtones.
Fixes #757
Fixes #354
Fixes #222
Closes #1815
Closes #3378

// FREEBIE
2015-06-11 11:09:02 -07:00
RiseT
05894827c1 Couple of cosmetic corrections for strings.xml
Closes #3364
2015-06-09 08:34:14 -07:00
agrajaghh
570f79d91a fix unit strings
Fixes #3295
Closes #3320

//FREEBIE
2015-06-03 11:44:50 -07:00
Geonu Kang
0cf9206170 Update "TextSecure messages" preferences strings
Fixes #3253
Closes #3254

//FREEBIE
2015-06-03 11:11:23 -07:00
agrajaghh
86c607a211 make search hint translatable
Fixes #3261
Closes #3262

//FREEBIE
2015-06-03 11:11:23 -07:00
agrajaghh
72bd6d5844 use ConfirmIdentityDialog instead of ReceiveKeyDialog
also switch to AppCompatDialog
2015-06-03 11:11:23 -07:00
Moxie Marlinspike
fe4e2fcadb Support for direct photo capture from app.
Make the send button toggle to an attach button when the
compose text and attachments are emmpty.

Part of #520
Closes #3186

// FREEBIE
2015-05-20 13:53:00 -07:00
Jake McGinty
fa39c23d44 ReceiveKeyActivity -> ReceiveKeyDialog
Closes #3158
// FREEBIE
2015-05-20 12:39:59 -07:00
Rhodey Orbits
720521d020 remove string resource
Obsoleted by 4c89b242be

Closes #3194
// FREEBIE
2015-05-20 12:33:43 -07:00
Moxie Marlinspike
95a94eeebf Create our own dialog when GooglePlayServicesUtil can't.
Fixes #2505
Closes #3005

// FREEBIE
2015-04-22 13:49:14 -07:00
Jake McGinty
64fc83326f bump sdk to 22, update notifications
Notification updates include:

1) Setting theme colors
2) Using high-res contact photos
3) Updating the notification icon to latest

Closes #2935
Fixes #2923
Fixes #2732
Fixes #2548

// FREEBIE
2015-04-16 08:38:31 -07:00
agrajaghh
1a5bd37849 translate "Message Details"
Fixes #2875
Closes #2876

//FREEBIE
2015-04-03 18:46:47 +02:00
Moxie Marlinspike
0efdada928 Prompt user to rate app
Closes #2841

// FREEBIE
2015-04-02 17:30:30 -07:00
Jake McGinty
0ff99258ac move routing logic to all activities
Fixes #2239
Closes #27923

// FREEBIE
2015-04-01 10:23:05 -07:00
agrajaghh
1b846c0842 remove unused resources
Closes #2594

//FREEBIE
2015-03-26 16:29:32 -07:00
Sam Whited
dbda758841 Add pref to change MMS user agent
Closes #2363

// FREEBIE
2015-03-26 15:48:53 -07:00
Jake McGinty
427c9a6b21 Use new MMS APIs in Lollipop onwards
Fixes #1937
Closes #2727
2015-03-26 11:05:41 -07:00
agrajaghh
62181a3d7f migrate AlertDialog to material-dialogs
Closes #2743
2015-03-25 11:50:52 -07:00
Moxie Marlinspike
b9e6cff20c Fix the build
Fixes #2787
2015-03-25 10:55:47 -07:00
Moxie Marlinspike
d65a7f1a25 Update invite strings.
// FREEBIE

Closes #2735
2015-03-25 10:49:52 -07:00
NorthwestBased
6ec9ee89a7 Disallow zero-length passphrases.
Fixes #2751
Closes #2762
2015-03-25 09:19:53 -07:00
agrajaghh
0f572d1e5d adapt SMS strings in preferences
Fixes #2672
Closes #2682

//FREEBIE
2015-03-16 11:02:22 -07:00
Jake McGinty
4185006147 add borderless thumbnails, "bubble" refactor
Closes #2430

// FREEBIE
2015-03-12 18:23:08 -07:00
Moxie Marlinspike
a4e18c515c Remove encrypted SMS transport, simplify transport options.
Closes #2647

// FREEBIE
2015-03-12 17:53:38 -07:00
Rhodey Orbits
2011391e65 Fix notifications for media messages without text.
They now read 'media message' in italics.

Closes #2649
2015-03-12 17:30:23 -07:00
Moxie Marlinspike
534df06794 Support granular "custom" MMS preferences.
1) Make each MMS preference an individual choice between custom
   and default.

2) Display default values.

Closes #2487

// FREEBIE
2015-03-05 18:42:34 -08:00
Rhodey Orbits
7ce7ec56eb 1) created a new string constant for 'Passphrase'.
2) modified 'App protection' preference group summary to be more verbose.
3) dropped the colons from 'Appearance' preference group summary.
4) dropped the colons from and 'SMS and MMS' preference group summary.
2015-03-05 18:20:39 -08:00
agrajaghh
067b14d551 make some strings translateable
closes #2567

//FREEBIE
2015-03-03 17:09:07 -08:00
Jake McGinty
753a1c7219 add FAB content description
// FREEBIE
2015-02-27 16:31:01 -08:00
Jake McGinty
ac0a1c0bc1 Conflicts UI touch-ups:
1) Fix i18n and layout naming.
2) Error header for message details.
3) Add back button to message details.

// FREEBIE

Closes #2593
2015-02-27 12:26:35 -08:00
Moxie Marlinspike
00d7b5c284 Better UX handling on identity key mismatches.
1) Migrate from GSON to Jackson everywhere.

2) Add support for storing identity key conflicts on message rows.

3) Add limited support for surfacing identity key conflicts in UI.
2015-02-27 12:26:09 -08:00
agrajaghh
a4bd9fae9a make "repeat alerts" setting translatable
Fixes #2511
Closes #2516

 //FREEBIE
2015-02-23 09:54:28 -08:00
Jake McGinty
5fac189736 "All images" view for conversations
// FREEBIE
2015-02-18 15:47:47 -08:00
Jake McGinty
10a74d6d08 move plurals to strings.xml
Resolves #2421
// FREEBIE
2015-02-09 11:19:30 -08:00
Jake McGinty
0fd52ad1fe more succinct relative dates
// FREEBIE
2015-02-06 13:00:21 -08:00
Moxie Marlinspike
57c17e705f Fix provisioning dialog strings.
// FREEBIE

Closes #2368
2015-01-24 10:16:33 -08:00
Jake McGinty
2e253fb6a8 provisioning dialog rework
// FREEBIE
2015-01-24 10:15:47 -08:00
Jake McGinty
810abe0275 material actionbar and fab
// FREEBIE
2015-01-21 19:01:23 -10:00
Moxie Marlinspike
a0ed0842a0 Add expiration check on build freshness.
// FREEBIE
2015-01-12 09:12:10 -08:00
Moxie Marlinspike
ed556fbd3a Support for multi-select in the conversation list.
// FREEBIE

Closes #1601
Closes #2214

Fixes #2188
Fixes #786
2014-12-29 13:54:59 -08:00
Moxie Marlinspike
6e85677c52 Support 'WiFi calling' devices.
// FREEBIE

Fixes #2254
Fixes #2240
Fixes #2160

Closes #2263
2014-12-29 12:51:39 -08:00
guiweber
d7419caa4b Moved several hard-coded UI strings to strings.xml
Closes #2203
2014-12-29 12:29:48 -08:00
McLoo
3ec95f7a8e More l10n - for decrypting errors
//FREEBIE

Closes #2231
2014-12-23 12:53:38 -08:00
Jake McGinty
e650349bb7 Catch issues with bad MMSC URIs, add validation
Fixes #2202
// FREEBIE
2014-12-16 16:01:22 -08:00
McLoo
188d11bc23 Added l10n for ZXing intent message box
Closes #2147
2014-12-12 19:05:31 -08:00
Aaron M Brown
a09e0afbd6 Explain size limit for large attachments in toasts.
// FREEBIE

Fixes #2100
Closes #2172
2014-12-12 18:45:06 -08:00
Moxie Marlinspike
426c56c77d Support install link
Closes #2001
Fixes #1722
2014-12-12 18:31:20 -08:00
Moxie Marlinspike
642334da1f Merge pull request #2212 from agrajaghh/betterpicker_translateable
make summary of passphrase timeout translatable
2014-12-12 17:04:29 -08:00
McLoo
b44acd82e6 Added l10n for message details
//FREEBIE

Closes #2173
2014-12-12 16:43:45 -08:00
agrajaghh
3c7e319029 make summary of passphrase timeout translatable
//FREEBIE
2014-12-13 01:37:06 +01:00
ultrasandwich
6980a32628 Fix user-facing helping term 'insecure' to 'unsecured'.
Insecure implies an uncertainty of intention or confidence.
Unsecured is more specifically addressing the protocol which
wraps the message delivered.

Closes #1811
2014-12-12 16:17:34 -08:00
McLoo
9beb51bd77 Enabled audio and video drafts
//FREEBIE

Closes #1799
2014-12-12 14:44:21 -08:00
Jake McGinty
c448a833f5 another minor pref tweak for mms fallback
1) fix summary for outgoing sms/mms
2) disable mms option when TS-users is unselected, same as the fallback
   approval option.

// FREEBIE
2014-12-11 22:46:59 -08:00
Jake McGinty
761049d6f8 minor preferences tweaks
1) shorten some summaries
2) add summaries to appearance subscreen
3) move common summary functions to common parent class

// FREEBIE
2014-12-11 22:12:12 -08:00
Jake McGinty
30232c1635 transport selection refactor
Closes #1724
// FREEBIE
2014-12-11 19:27:24 -08:00
Bastian Köcher
4a088410ae "add contact" button for unknown contacts
Closes #1551
2014-12-11 18:59:29 -08:00
Jake McGinty
b05967f2c9 Show drafts in conversation list snippets
// FREEBIE
2014-12-11 18:27:54 -08:00
Moxie Marlinspike
3c4ac4b105 Add option that allows disabling MMS fallback with TS users.
// FREEBIE

Closes #1444
2014-12-11 16:12:36 -08:00
3xo
ff05642f3e Enable progress indicator on group update
Closes #1165
2014-12-11 16:05:07 -08:00
agrajaghh
2f6cefca8a refactor preferences into multiple PreferenceFragments 2014-12-11 14:02:28 -08:00
Jake McGinty
15613894f0 load image previews asynchronously
// FREEBIE
2014-12-03 13:03:03 +00:00
Jake McGinty
f3f173f653 support mms basic auth
// FREEBIE
2014-12-02 08:59:43 +00:00
McLoo
899bf8160d Cleanup of unused strings in strings.xml
//FREEBIE

Closes #2139
2014-11-29 13:35:36 -08:00
McLoo
49f77c9c06 Added l10n for message trimmer
//FREEBIE

Closes #2079
Closes #1868
2014-11-29 13:31:44 -08:00
Jake McGinty
b0891fa986 move log submission to new library
// FREEBIE

Closes #1655
2014-11-29 11:42:25 -08:00
Moxie Marlinspike
b57763f397 Display 'me' for device's local number in group membership list.
// FREEBIE

Fixes #1494
Closes #1505
2014-11-28 10:46:50 -08:00
Moxie Marlinspike
bf19307916 Make GCM re-registration failure notification based.
// FREEBIE
2014-11-23 17:12:35 -08:00
Jake McGinty
98af1fb6ee shorten blocks of text
// FREEBIE
2014-10-29 16:53:25 -07:00
Jake McGinty
53da1f849a in-app image media preview
// FREEBIE
2014-10-28 00:50:01 -05:00
Jake McGinty
31167d11dd use wildcard media types, don't crash on preview fail
// FREEBIE
2014-10-17 17:59:56 -07:00
Jake McGinty
6e3751a0c5 sane fallback for media selection on exception
Fixes #1763
// FREEBIE
2014-10-17 17:41:42 -07:00
Moxie Marlinspike
40495a2261 Merge pull request #1854 from mcginty/content-description
improve some content descriptions
2014-08-19 21:00:20 -07:00
Jake McGinty
a6c1fdd914 improve some content descriptions
// FREEBIE
2014-08-19 19:10:15 -07:00
Jake McGinty
020d61dd6e migrate nav panel items to actionbar
Fixes #1819
Closes #1839
// FREEBIE
2014-08-19 15:20:57 -07:00
Jake McGinty
de63b0dd96 make reminder a custom view, make push reminder
// FREEBIE
2014-08-04 15:25:53 -07:00
Jake McGinty
7d688846f9 Move default SMS and system import to "reminders"
// FREEBIE
Closes #1730
2014-07-27 01:09:39 -07:00
Jake McGinty
bea3c33223 disable passphrase creation on registration
// FREEBIE
Closes #1726
2014-07-25 17:46:50 -07:00
Moxie Marlinspike
358c923891 Merge pull request #1630 from mcginty/remove-keys-list
remove ReviewIdentitiesActivity
2014-06-23 11:17:17 -07:00
Jake McGinty
5121ab0eed temporarily disable encrypted backup
// FREEBIE
2014-06-22 16:40:02 -07:00
Jake McGinty
f63f95404e remove ReviewIdentitiesActivity
// FREEBIE
2014-06-22 16:21:30 -07:00
Moxie Marlinspike
0d35e2bfa9 Fix the "Tap for X fallback" labels. 2014-06-13 17:48:56 -07:00
Moxie Marlinspike
983bf672cf Fix UI side of broken MMS fallback.
1) Actually tell the SendReceiveService to send the MMS if it is
   one.

2) Display the correct string (SMS vs MMS) in the fallback dialog.
2014-06-13 17:39:29 -07:00
Moxie Marlinspike
ba1055df8e Correct contextual send language.
1) Use "secure" and "insecure" vs "encrypted" and "unencrypted.

2) Use MMS instead of SMS where appropriate.

Fixes #1602
2014-06-13 15:24:38 -07:00
phenx-de
a54d20f3ef Add "%s selected" subtitle to Conversation List batch mode. 2014-06-13 09:35:36 -07:00
phenx-de
ea0fa58265 Add preview of encryption channel in compose text hint. 2014-06-12 16:32:31 -07:00
Veeti Paananen
bd889d8fa9 Reword the very confusing screen security setting 2014-06-12 09:22:39 -07:00
Moxie Marlinspike
c719a48a2c Move media attachment long-click event to context menu.
Long-click on a media attachment will now bring up the normal
context menu for a ConversationItem long-click, but with the
addition of a "save attachment" option.

This allows users to long-click on messages with media in them
and still see the other contextual menu options.

// FREEBIE
2014-06-11 18:04:14 -07:00
Moxie Marlinspike
68747142d6 Add correct contextual menu options on 'Send' button.
[Send TextSecure message | Send unencrypted SMS | Send encrypted SMS]

// FREEBIE
2014-06-11 15:34:01 -07:00
Joshua Lund
667da3b2cf Fixing a typo in the WhisperPush error message
// FREEBIE
2014-06-10 20:56:45 -06:00
thoughtbox
bc769debe2 Capitalisation according to Android guidelines
Not all updated capitalisations were correct.
2014-06-05 09:24:31 +02:00
Corbin Souffrant
db356a0ec9 Fixed capitalization inconsistensies with Android guidelines.
Fixes #673
2014-06-03 18:51:21 -07:00
Jake McGinty
ce7b8ab75a new passphrase prompt activity
// FREEBIE
2014-05-19 12:16:42 -07:00
thoughtbox
08d899e2e1 Slightly more verbose "no legacy support" message. 2014-04-28 11:02:48 -07:00
Moxie Marlinspike
0574ec170a Display legacy message error when V1 message is received. 2014-04-16 11:47:51 -07:00
Santoso Wijaya
12dac6ccc3 ShareActivity, destruction of RecipientsPanel
// FREEBIE
2014-04-10 13:16:14 -07:00
Jake McGinty
e2f7c1529a group and contact list fixes
1) Updating a group without changing the avatar will keep that
   avatar

2) Prohibit adding non-push users to an existing push group

3) Add Android contacts to the same database. Takes a small amount
   more time and memory, but allows queries to not be a hack, and
   enables us to dedupe numbers in JB and higher devices.

// FREEBIE
2014-04-10 11:14:06 -07:00
Jake McGinty
d4d684b670 simplified layouts 2014-04-03 09:59:32 -07:00
Moxie Marlinspike
54d2184c72 Merge pull request #1205 from mcginty/contact-select
refactor and improve contact selection
2014-04-02 22:11:44 -07:00
Jake McGinty
832763f695 UX for unencrypted fallback case 2014-04-02 22:10:51 -07:00
Moxie Marlinspike
fd1a18d2d0 Don't display duplicate push messages. 2014-04-02 22:10:50 -07:00
Jake McGinty
ca6d8a8a0d refactor and improve contact selection
* unify single and multi contact selection activities
* follow android listview design recommendations more closely
* add contact photos to selection
* change indicator for push to be more obvious
* cache circle-cropped bitmaps
* dedupe numbers when contact has multiple of same phone number

// FREEBIE
2014-04-01 14:56:45 -07:00
Buck Doyle
61fbf382eb Extract Input Settings preference header string.
Fixes #1159

FREEBIE
2014-03-15 22:18:14 -04:00
Jake McGinty
d827ab1b36 more precise sms controls
// FREEBIE
2014-03-13 20:59:20 -07:00
Moxie Marlinspike
ad54d2a05f Modify string tag.
//FREEBIE
2014-03-12 09:57:32 -07:00
3xo
339193af12 Give user the opportunity to chose no LED-notification. 2014-03-07 12:04:19 -08:00
Jake McGinty
054fcdca8d Merge pull request #1007 from SamWhited/issue998
s/Verify Recipient/Verify Identity/
2014-03-04 13:49:49 -08:00
Sam Whited
fa423e4432 s/Verify Recipient/Verify Identity/ 2014-03-04 09:55:45 -05:00
Jake McGinty
90169e9468 pending messages more accurately conveyed to user 2014-03-03 11:56:54 -08:00
Lukas Barth
39ee363150 Add possiblity to refresh the push directory directly from the contact picking list. Fixes #835. Fixes #859.
Thanks benalbrecht for the icons.
2014-03-03 18:23:14 +01:00
Moxie Marlinspike
977765c80f Merge pull request #941 from Wikinaut/add-new-string-ViewIdentityActivity_my_identity_fingerprint
add new string ViewIdentityActivity_my_identity_fingerprint
2014-03-02 15:50:18 -08:00
Thomas Gries
4b2d07ab35 add new string ViewIdentityActivity_my_identity_fingerprint 2014-03-03 00:45:42 +01:00
Jens Füllenbach
003ebe6364 Added the color white to the notification colors of the LED. 2014-03-02 14:11:31 -08:00
Benjamin Albrecht
2f7c005c23 Show confirmation box before disabling push messages 2014-03-02 14:09:54 -08:00
Moxie Marlinspike
5cd8c922d2 Merge pull request #648 from veeti/tweaks-and-polish
Assorted tweaks and polish
2014-03-02 14:01:20 -08:00
Benedict Pregler
ee921a8f49 fixed some hardcoded strings 2014-03-02 13:22:02 -08:00
Veeti Paananen
de100f5be7 Add missing spaces 2014-03-02 09:40:45 +02:00
Moxie Marlinspike
81ee9e31c5 Update behavior for incoming SMS path.
1) On KitKat, unencrypted SMS messages are never stored in
   TextSecure unless it is set as the system-wide default.

2) On KitKat, if TextSecure is set as the system-wide default,
   provide an option to change the default to a different app.

3) Don't store the TextSecure challenge on KitKat+ devices.
2014-02-28 13:40:35 -08:00
Moxie Marlinspike
a3e900ecbe Merge pull request #794 from SamWhited/issue788
Add option to disable screen security
2014-02-27 18:02:05 -08:00
Sam Whited
384fb3b2b5 Add option to disable screen security
See WhisperSystems/TextSecure#788
2014-02-27 19:00:39 -05:00
Matt Enright
852ca2ac05 Don't display sender in outgoing message details
Because we don't know it. Fixes WhisperSystems#711.
2014-02-26 21:57:17 -05:00
Jake McGinty
0015711759 migrate logcat submit to preferences
// FREEBIE
2014-02-25 23:11:00 -08:00
Jake McGinty
ce68429a9b activity to submit logcat to pastebin 2014-02-25 22:14:21 -08:00
Moxie Marlinspike
20fd881613 Display error code from server when already registered elsewhere. 2014-02-25 17:00:31 -08:00
Tim Bücher
bd167cbb17 Fix missing localozation strings for custom LED blink pattern. 2014-02-25 11:38:31 +01:00
Jake McGinty
a0aaa7d724 Explain why SMS fallback is disabled when it is 2014-02-25 01:23:22 -08:00
Moxie Marlinspike
ca2eecaedf Add advanced preference for refreshing push directory. 2014-02-23 15:12:40 -08:00
Moxie Marlinspike
c36b5869fc Tweak create passphrase screen text. 2014-02-23 14:37:05 -08:00
Moxie Marlinspike
056dbd1a4e tweak text
//FREEBIE
2014-02-22 14:42:02 -08:00
Moxie Marlinspike
315cf2d8e4 Eliminate concept of group 'owner'. 2014-02-22 11:29:28 -08:00
Moxie Marlinspike
da57a689c1 Fill in some strings.
// FREEBIE
2014-02-22 11:10:30 -08:00
Moxie Marlinspike
9c9866e7ee Add 'leave group' functionality. Includes other bug fixes. 2014-02-22 10:54:43 -08:00
Jake McGinty
7beab36c6a updates to conversation menu, and updating of group info
// FREEBIE
2014-02-21 11:33:31 -08:00
Moxie Marlinspike
918f223149 Add preference to disable the SMS channel all together.
1) If the SMS fallback preference is disabled, no outgoing
   messages will succeed via the SMS transport.

2) If the SMS fallback preference is disabled, "mirroring" the
   SMS db state when not the default system SMS app is disabled.
2014-02-20 14:49:31 -08:00
Jake McGinty
0cdc6fd87d embrace the darkness, don't open quickcontact for groups
// FREEBIE
2014-02-19 15:01:10 -08:00
Jake McGinty
0688dd0c2c repurpose ImageDivet for avatar, minor lint, fix bitmap decoding
// FREEBIE
2014-02-19 00:01:37 -08:00
Jake McGinty
e05bacd8c3 fixing avatar selection when some gallery apps won't return any extras
but still succeed // FREEBIE
2014-02-18 16:42:33 -08:00
Moxie Marlinspike
760c96171d Merge branch 'master' into groups 2014-02-18 13:53:35 -08:00
Jake McGinty
25324a45b3 Show something for unnamed groups, allow us to have different default photos for groups vs. individuals 2014-02-17 21:42:30 -08:00
Jake McGinty
877ed8f59c Show TS group titles properly, hide MMS options 2014-02-17 20:25:40 -08:00
Jake McGinty
e8251800ab gb icon for new group changed 2014-02-17 18:17:23 -08:00
Jake McGinty
93329df530 avatar selection on gb fixed, disable push groups if not push registered 2014-02-17 17:33:20 -08:00
Jake McGinty
e81526e581 error messaging for group creation issues 2014-02-17 15:48:09 -08:00
Moxie Marlinspike
e7e5bc0884 Verify identity keys on outgoing messages.
If PreKeyEntity identity key doesn't match local DB, fail
outgoing message and queue "incoming" identity key update
message for manual user approval.
2014-02-16 15:23:49 -08:00
Jake McGinty
556b0dec1d pretty up the interface/colors a bit. 2014-02-14 16:21:48 -08:00
Jake McGinty
9b41675f8f single contact selection 2014-02-14 16:21:48 -08:00
Jake McGinty
fe55ac57d9 strings, strings, strings 2014-02-12 18:12:58 -08:00
Jake McGinty
01a438de09 basic messaging when non-push users are added 2014-02-12 17:17:33 -08:00
Jake McGinty
b4a4e629f1 alignment and string work 2014-02-12 12:05:18 -08:00
Jake McGinty
ed3151bdb5 backward compatible navigation drawer toggle // FREEBIE 2014-02-01 19:40:46 -08:00
Jake McGinty
9fd2c4753e ui wip 2014-01-25 23:39:56 -08:00
Jake McGinty
28c1c5006b icon, contact list and conversation redesign 2014-01-09 19:06:41 -10:00
Moxie Marlinspike
a4a3b4a453 Update registration strings 2014-01-07 15:16:23 -08:00
Moxie Marlinspike
44092a3eff Support for Axolotl protocol.
1) Split code into v1 and v2 message paths.

2) Do the Axolotl protocol for v2.

3) Switch all v2 entities to protobuf.
2014-01-06 14:37:52 -08:00
Moxie Marlinspike
073b1f69e3 Rollbacks, v2 sms-transport key exchanges, push identity conflicts.
1) Stop protocol rollbacks.

2) Handle v2 version key exchange messages.

3) Handle identity key conflicts on prekeybundle messages.
2014-01-06 14:35:53 -08:00
Moxie Marlinspike
2042ca6cb7 Generate "prekeys" at push registration time.
This generates a large number of key exchange messages and
registers them with the server during signup.
2014-01-06 14:34:47 -08:00
Moxie Marlinspike
d7070e7ecf Inserted the Registration activity into initial setup flow.
1) Added push messaging toggle to preferences.

2) Added push messaging registration screen to setup flow.

3) Migrated rest of SharedPreferences accessors to
   TextSecurePreferences.
2014-01-06 14:30:03 -08:00
Moxie Marlinspike
0ed9da9a2c Strings and slight cleanup 2014-01-06 14:21:50 -08:00
Moxie Marlinspike
2539723410 Fix string 2014-01-06 14:19:06 -08:00
Moxie Marlinspike
0958c30400 Stringify 2014-01-06 14:19:06 -08:00
Moxie Marlinspike
7eef93c829 Stringify and clean layout 2014-01-06 14:19:05 -08:00
Moxie Marlinspike
3634ba0b55 Registration with voice verification. 2014-01-06 14:18:30 -08:00
thoughtbox
8186694555 Change to string refs for Enter
To allow for translation
2014-01-02 18:53:50 +01:00
Veeti Paananen
eb1b762a76 Improve password caching notification UI & UX
On Jelly Bean and above:

- Use the standard notification style for a better and consistent visual
  appearance

- Use the JB notification actions API for the locking action

- Use a lower notification priority to prioritize other notifications
  over TextSecure

On ICS:

- Use the existing custom notification layout

Everywhere:

- Allow opening the app itself from the notification

- Simplify strings: don't talk about a "cached passphrase" but about the
  app being "unlocked"/"locked"
2013-12-22 04:48:39 +02:00
Veeti Paananen
6eb094c87e Show LED and ringtone setting values in their summaries
As instructed in the Android design guidelines. Also removed unnatural
capitalization.
2013-12-17 03:13:22 +02:00
Joshua Lund
0fed5593a8 Incredibly minor cleanup of the strings file 2013-12-16 15:11:17 -07:00
thoughtbox
b56a4f9740 Update strings.xml to reference Sound summary in Settings. 2013-12-04 22:47:54 +01:00
thoughtbox
33fd6414b8 Update strings.xml
Removed emoticon from QuickResponse and changed the wording slightly of the "default SMS app" setting.
2013-12-03 11:08:36 +01:00
Moxie Marlinspike
0c0db28358 Fix string case 2013-12-02 17:11:16 -08:00
Moxie Marlinspike
b0216e1494 Finish KitKat compatibility details.
1) The system does actually enforce having a BROADCAST_SMS
   permission on the SMS receiver. Break out the "delivered"
   parts of this into a separate Receiver, so the permission
   won't trip up GB devices.

2) The system does actually enforce having "quick response"
   intents.  Add a no-op for now.

3) Add a "make default" prompt.

4) Update settings to reflect what's going on in KitKat.
2013-12-02 12:31:59 -08:00
Moxie Marlinspike
891e3aeb97 Merge pull request #381 from meskio/add_contact
New 'add contact info' option on the conversation contextual menu
2013-10-20 16:58:58 -07:00
rhodey
2c2a03e5e2 Enhanced MMS configuration prompts and processing.
1) Added a new message status to MmsDatabase to
   signify a pending MMS download which requires
   APN settings.

2) Added a database method to query MMS messages
   based on status.

3) Added login to SendReceiveService for processing
   of MMS pending APN information.

4) Moved all APN/MMS settings into ApnPreferencesActivity
   and transformed PromptApnActivity into a simple
   informational activity.

5) Added logic to check for APN settings on send and
   receive of all MMS (media, group, email) and direct
   user to PromptApnActivity then ApnPreferencesActivity
   if necessary.

6) Vocab/grammar adjustments.
2013-10-20 16:56:34 -07:00
Ruben Pollan
3d690faff0 New 'add contact info' option on the conversation contextual menu
This option is used to add phone numbers from the contact list on the
messages.
2013-10-17 02:28:36 +02:00
Moxie Marlinspike
f49c62793b Merge pull request #377 from meskio/resend_message_on_fail2
Allow to resend a failed message
2013-10-15 06:32:12 -07:00
Moxie Marlinspike
f27c7c4178 Merge branch 'thoughtbox-patch-1'
Conflicts:
	res/values/strings.xml
2013-10-15 06:28:18 -07:00
thoughtbox
cfc255a7b7 update to in-thread notification description
I felt that the description of what "in-thread notification" could be difficult to understand for some. This is better, I think (though I'm not fully satisfied).
2013-10-13 20:08:56 +02:00
thoughtbox
615ca931d4 Update strings.xml
I think it should be "in-thread" rather than "in thread".
2013-10-13 19:47:22 +02:00