Commit Graph

627 Commits

Author SHA1 Message Date
Daniel Gultsch 1e28f60038 changed conversation red to material red 2015-05-10 03:14:13 +02:00
Daniel Gultsch 43db9cdf4b turn send button in cancel button while in whisper mode 2015-05-03 09:30:30 +02:00
Daniel Gultsch 53fea9e1fe replace send button with quick action button as long as no text has been entered 2015-05-02 11:38:56 +02:00
Daniel Gultsch e1fab8a488 pulled translations from transifex 2015-05-01 13:52:19 +02:00
Daniel Gultsch f0d51fcb77 pulled translations from transifex 2015-04-29 10:19:03 +02:00
Daniel Gultsch d94c231a74 adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar) 2015-04-28 16:25:32 +02:00
Daniel Gultsch 92d14c4a00 increased padding on image buttons on v21 to match material guidelines 2015-04-28 14:46:52 +02:00
Daniel Gultsch 93e942f96d made material icons smaller (24dp) 2015-04-28 14:28:51 +02:00
Daniel Gultsch a4ff8e3633 increased padding around switches in manage accounts 2015-04-27 12:19:05 +02:00
Daniel Gultsch 7f2a83a684 pulled translations from transifex 2015-04-26 10:48:36 +02:00
Daniel Gultsch 0fda254d48 Merge pull request #1135 from BrianBlade/manage_certificates
Add option to remove manually approved certificates
2015-04-25 19:09:50 +02:00
Daniel Gultsch e9783b80d1 added missing translations from transifex 2015-04-21 10:13:28 +02:00
Daniel Gultsch e7972d3d11 pulled latest translations from transifex 2015-04-20 20:32:50 +02:00
BrianBlade da367dd752 Add option to remove manually approved certificates
- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options"
2015-04-19 18:08:13 +02:00
iNPUTmice f99e234b88 maintain state when rotating settings activity 2015-04-14 15:53:50 +02:00
iNPUTmice defb127d6e Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml
2015-04-14 15:17:06 +02:00
iNPUTmice 845b39cdcc fixed regression where the selected conversation wasn't highlighted anymore on tabled layout 2015-04-13 15:59:18 +02:00
BrianBlade 878066ca99 Add option to use MTM without default TrustManager
Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked.
2015-04-11 15:13:42 +02:00
BrianBlade dace8ba3d3 Enable end-conversation by swipe gesture
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews

Re-enable selectableItemBackground

Dont end selectedConversation on swipe

Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.

Add blacklistedConversation for undo swipe

Update title_undo_swipe_* strings

Fix undo(), rename blacklistedConversation

Fix discardUndo(); re-init selectedConversation

maintain scroll position after undo

clear notification when dismissing a conversation

modified / simplified maintain scroll position code

simplify handling of selectedConversation

change undo_muc string, remove notifyDataSetChanged()
2015-04-08 23:29:52 +02:00
iNPUTmice b7b87e1a8d do not overlap account title and switch 2015-04-01 23:45:46 +02:00
iNPUTmice cb29c5bb15 Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch 2015-04-01 23:24:35 +02:00
Daniel Gultsch 1a376cacac Merge pull request #1076 from rk4an/patch-1
Update french translation
2015-04-01 20:30:00 +02:00
iNPUTmice 64d6a2970e pulled translations from transifex 2015-04-01 20:26:28 +02:00
BrianBlade e64049c4fc Add toggle account-state switch
Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu
2015-04-01 12:47:59 +02:00
Erkan 2a73173176 Update french translation 2015-03-22 20:09:53 +01:00
iNPUTmice ad8f1902d1 pulled translations 2015-03-22 18:56:28 +01:00
iNPUTmice 0d6475d0d9 pulled more translations 2015-03-19 19:32:24 +01:00
Andreas Straub f76baa5658 Added multiple select to Choose Contact Activity
When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.

The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation
2015-03-18 17:11:50 +01:00
iNPUTmice 4aab45533a pulled new translations from transifex 2015-03-16 11:52:42 +01:00
iNPUTmice db6a63bcf6 open location directly from notification 2015-03-10 21:46:13 +01:00
iNPUTmice 5132cd7234 show geo uris as 'location' in overview 2015-03-10 17:20:50 +01:00
iNPUTmice 87a048fe6f display geo uris as location. show 'send loction' in share menu if request location intent can be resolved 2015-03-07 14:15:38 +01:00
iNPUTmice 0d6907f1e0 pulled new translations from transifex 2015-02-27 17:20:41 +01:00
iNPUTmice 3e8314459c pulled new translations from transifex 2015-02-23 21:56:06 +01:00
iNPUTmice 7ee5e95959 added typing notifications through XEP-0085. fixed #210 2015-02-21 11:06:52 +01:00
iNPUTmice a6e6959614 pulled translations from transifex 2015-02-16 16:56:40 +01:00
iNPUTmice 44ee746681 added actions to error notification 2015-02-10 17:13:34 +01:00
Sam Whited 1650565bb0 Remove another unused resource 2015-02-01 16:02:59 -05:00
Daniel Gultsch a4f4fe95ac Merge pull request #955 from SamWhited/unused_resources
Remove unused resources
2015-02-01 17:41:42 +01:00
iNPUTmice e0af29f0a3 pulled spanish translations again 2015-02-01 17:33:36 +01:00
Sam Whited 735fc655e9 Remove unused resources 2015-02-01 11:32:11 -05:00
iNPUTmice 33530a9e30 pulled translations from transifex 2015-02-01 17:04:29 +01:00
Sam Whited ce5c6c6257 Removes some unused strings (the legacy SSL stuff) 2015-02-01 08:58:35 -05:00
kruks23 e76a9c06c3 Remove title_activity_conversations and use app_name instead 2015-01-30 17:02:53 +01:00
Sam Whited 48604a6620 Use Material Design Icons on API 21+ 2015-01-29 15:28:26 -05:00
iNPUTmice 14fc520ec0 updated translations 2015-01-25 16:36:57 +01:00
Jaroslav Lichtblau 0f3fb3ab43 Czech translation
for "hide offline" added
2015-01-25 16:18:09 +01:00
iNPUTmice 4e50098e31 show checkbox to hide offline contacts 2015-01-21 17:24:02 +01:00
iNPUTmice be9af442ef always allow access to contact details. provide add button in contact details 2015-01-21 15:31:40 +01:00
Sam Whited 764ef3c8cd Add block/unblock to contact details menu
See #889
2015-01-21 13:07:36 +01:00
iNPUTmice 32a16137df Fixed action bar search for Android 5.0 2015-01-20 14:53:47 +01:00
Jaroslav Lichtblau 7e4053abff Czech translation updated
for Conversations
2015-01-19 19:07:43 +01:00
Sam Whited 503237087f Remove legacy SSL support 2015-01-19 11:02:13 -05:00
iNPUTmice c5d087ad55 fetched translations from transifex 2015-01-19 12:14:55 +01:00
iNPUTmice 149a6716b8 proper desc for offering and sending images in conversations overview 2015-01-18 20:26:22 +01:00
iNPUTmice 6756386eee explain read marker 2015-01-18 13:44:18 +01:00
iNPUTmice d58fadd05f use same helper methods for images and files 2015-01-18 13:00:57 +01:00
Daniel Gultsch 78ac43cfa2 Merge pull request #901 from kriztan/patch-2
Added new file type names for file transfers
2015-01-18 11:57:34 +01:00
Christian S ae16439bd6 Added new file type names for file transfers
- apk
- vcard
2015-01-18 11:17:27 +01:00
Sam Whited 83c806a774 Fix string substitutions with unknown filetypes 2015-01-17 20:53:25 -05:00
Sam Whited dfc1cea882 Correct the download file string on notifications
Fixes #896
2015-01-17 09:11:04 -05:00
Sam Whited edd58f19b4 Add download button on notification if applicable 2015-01-16 01:10:01 -05:00
iNPUTmice c0993a9acb show toast when avatar has been published - fixed #874 2015-01-15 16:26:46 +01:00
iNPUTmice 994c9495ba added dedicated button to disable foreground service in perma notification 2015-01-15 16:17:55 +01:00
Daniel Gultsch a3f9f30a6c Merge pull request #885 from SamWhited/display-enter-key
Add option to swap enter/emoticon key
2015-01-14 22:54:02 +01:00
Sam Whited 0a96bec3c1 Add option to swap enter/emoticon key 2015-01-14 16:14:14 -05:00
Sam Whited 548a585b2c Harden the TLS connection cipher suites 2015-01-14 13:10:15 -05:00
Sam Whited acb3aed99c Fix bottom padding on about page 2015-01-13 21:29:47 -05:00
Daniel Gultsch 7d2a9624b5 make use of different dimensions for different screen sizes 2015-01-13 11:52:41 +01:00
Daniel Gultsch 1262a7cba7 Merge pull request #872 from Elinvention/development
Updated Italian translations
2015-01-13 10:48:02 +01:00
Daniel Gultsch 1fac4754d8 Merge pull request #873 from SamWhited/about-margin-fix
Use margin instead of padding on about screen
2015-01-13 10:12:33 +01:00
Sam Whited d9c2fa39cd Use margin instead of padding in about screen 2015-01-12 23:08:26 -05:00
Elia 8f6ee1fe22 Updated Italian translations 2015-01-13 01:32:51 +01:00
Jaroslav Lichtblau c920a09a0c Czech translation
updated
2015-01-12 20:07:26 +01:00
Daniel Gultsch 8d3323e384 context menu for files and offered files. fixed #848 fixed #849 2015-01-12 16:42:20 +01:00
Daniel Gultsch 77e4e1c2ac reworked message preview / message meta information (ie file offered, received * file)
fixed #837
2015-01-12 16:09:39 +01:00
Daniel Gultsch 0aa50cb5a1 shortened some string 2015-01-11 01:01:33 +01:00
Daniel Gultsch e34bc920e4 fixed #860 2015-01-10 23:56:56 +01:00
Daniel Gultsch 06eae476ee Introduced expert options to control enter-is-send
(default == off)
2015-01-09 19:23:26 +01:00
Daniel Gultsch 734a9934a3 make project translatable via transifex 2015-01-09 02:06:03 +01:00
Daniel Gultsch ffa97c48f5 added missing drawables 2015-01-08 23:02:31 +01:00
Daniel Gultsch a9159568b9 allow for very basic muc configuration 2015-01-08 21:29:26 +01:00
Daniel Gultsch f8aa1bfec4 kick after ban 2015-01-08 01:23:53 +01:00
Daniel Gultsch f8dc59be81 fixed german translation 2015-01-08 00:41:37 +01:00
Daniel Gultsch 061de5205e some clean ups for affiliation change context menu 2015-01-08 00:23:26 +01:00
Daniel Gultsch cff9a937f2 Merge pull request #851 from kriztan/patch-2
Updated German translations for more muc options
2015-01-07 23:53:36 +01:00
Daniel Gultsch 20aa7bea47 Merge pull request #852 from SamWhited/ellipsis
s/.../…/ in CS strings
2015-01-07 23:53:26 +01:00
Daniel Gultsch 8505102cee Merge pull request #850 from plsng/dutch
Update Dutch translations
2015-01-07 23:53:08 +01:00
Sam Whited e1ea20b392 s/.../…/ in CS strings
[ci skip]
2015-01-07 13:42:49 -05:00
Christian S. 45c1e88a08 Updated German translations for more muc options 2015-01-07 19:06:18 +01:00
Nathan Follens c9dc82d134 Update Dutch translations 2015-01-07 18:49:13 +01:00
Daniel Gultsch 8d655f445a more muc options
* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this
2015-01-07 18:34:24 +01:00
Daniel Gultsch 8ab19faddd Merge pull request #847 from kriztan/patch-1
Updated German translations...
2015-01-07 18:30:16 +01:00
Christian S 9d43ddbf59 Updated German translations...
...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation?

I've changed the translations.

Updated German translations...

Updated German translations...
2015-01-07 18:08:18 +01:00
Daniel Gultsch af1410b02a Merge pull request #845 from SamWhited/material
Add materials theme for v21 devices
2015-01-07 15:57:27 +01:00
Daniel Gultsch ef525fb10e basic affiliation changes in muc 2015-01-07 15:03:29 +01:00
Daniel Gultsch a7ee9cc41b Merge pull request #846 from kruks23/translation4
Update spanish translation
2015-01-07 10:28:37 +01:00
kruks23 a1a2a39108 Update affiliation in MUC details and advance mode 2015-01-07 08:50:19 +01:00
Sam Whited 45bb59dba8 Add materials theme 2015-01-06 21:37:49 -05:00
Jaroslav Lichtblau 066f60a23c Czech translation for - show affiliation instead of role in MucDetails 2015-01-06 21:15:32 +01:00
Benoit Bouvarel 352af145f8 Update strings.xml
char ">" was missing at line 285
2015-01-06 01:23:51 +01:00
Benoit Bouvarel f8758b7bd5 Update strings.xml
French translation updated
2015-01-05 23:42:37 +01:00
Christian Schneppe 47a8a39595 corrected German spellings
and shorten some strings
2015-01-05 15:59:21 +01:00
Daniel Gultsch bdb335e6b0 Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role 2015-01-05 15:06:39 +01:00
Christian Schneppe ddee804a01 Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB 2015-01-05 12:46:13 +01:00
Daniel Gultsch e6cd92a663 added higher auto accept file sizes
also changed labeling to MiB and KiB
2015-01-04 17:53:06 +01:00
Jaroslav Lichtblau 3a4fbcd4cc Czech translation update 2015-01-04 12:43:32 +01:00
Daniel Gultsch 51f5b84ee4 Merge pull request #829 from kriztan/patch-1
corrected German 'private_message_to'
2015-01-04 11:28:38 +01:00
sergio c674e9c3e9 Update spanish translations 2015-01-04 11:24:53 +01:00
kriztan b739a0d200 corrected German 'private_message_to' 2015-01-04 11:16:21 +01:00
kriztan 58b7e71e58 Added and modified German translations 2015-01-03 19:35:58 +01:00
Daniel Gultsch be7de054be record voice and attachment refactor 2015-01-03 16:06:59 +01:00
Daniel Gultsch 960b7343d3 disable / enable all accounts 2015-01-03 13:36:48 +01:00
Daniel Gultsch 715c8545f4 added missing layout file 2015-01-03 10:35:12 +01:00
Daniel Gultsch 969044b113 migrated change password into separate activity 2015-01-03 00:11:02 +01:00
Daniel Gultsch 1988e244ef some further otr improvements 2015-01-02 15:14:06 +01:00
kriztan eca826caf3 Added German translations 2015-01-02 09:12:17 +01:00
Daniel Gultsch bb3bf25523 fixed layout file 2015-01-02 01:37:19 +01:00
Daniel Gultsch 3833e6dfef improved OTR verification part one 2015-01-02 01:21:14 +01:00
Sam Whited 0882da2568 Make `app_name' string untranslatable
Remove untranslatable about message

Escape single quote in NL translation
2014-12-29 19:38:47 -05:00
Daniel Gultsch c78dc5b494 fixed nl strings 2014-12-30 01:15:12 +01:00
Daniel Gultsch 5df8e6a5b3 Merge pull request #812 from kriztan/patch-1
Update german translations
2014-12-30 00:22:49 +01:00
Daniel Gultsch 55b84d0895 Merge pull request #813 from plsng/translation
Update Dutch translations
2014-12-30 00:22:33 +01:00
Nathan Follens 800520b27b Update Dutch translations 2014-12-29 23:08:07 +01:00
sergio 164c41661e Update spanish translations 2014-12-27 13:04:37 +01:00
Nathan Follens 4a8342a378 Update Dutch translations 2014-12-27 12:53:15 +01:00
kriztan 3b3d51b39a Update german translations 2014-12-27 10:42:15 +01:00
Daniel Gultsch 193d2645e6 code cleanup for change password stuff 2014-12-25 22:28:19 +01:00
Daniel Gultsch 0c22a8d1c6 added callback to change account password to notify UI on success / failure 2014-12-25 22:08:13 +01:00
Sam Whited e4d9dca2fe Add ability to change password on server
Fixes #260
2014-12-25 21:38:55 +01:00
kriztan 3b127ab743 Update german translations 2014-12-25 09:14:34 +01:00
Sam Whited 01107e31ae Add more server compatibility info.
Hide server info behind a checkbox.

Add XEP-0352 support to the server info list

Add XEP-0237 to server info list

Add XEP-0352 support to the server info list

Add MaM and Blocking to the account XEPs list

Also add a toggle button to hide some of the list
Rebase on current codebase

Make MAM string more descriptive

Change show more button to checkbox menu item

Shorten `MAM (History)' to `MAM'

Order XEP list and hide all by default

Supress warning (which is wrong anyways)

Change `Show more' to `Show more info'
2014-12-23 12:44:30 -05:00
Sam Whited af7a64491f Add support for XEP-0191 (Blocking command)
Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-22 08:19:00 -05:00
Daniel Gultsch 675bac7255 Merge pull request #794 from svetlemodry/development
Czech image transfer string fix
2014-12-20 12:14:11 +01:00
kruks23 6dd75cbb07 Update spanish translations 2014-12-20 10:54:23 +01:00
Jaroslav Lichtblau c8cfd1b084 Czech image transfer string fix 2014-12-19 22:50:43 +01:00
Jaroslav Lichtblau 7c4a306ae4 Czech translation updated
added missing strings
2014-12-18 18:42:50 +01:00
kriztan 948112c2f3 Update german translations 2014-12-18 12:10:03 +01:00
iNPUTmice 741a0c129d made scroling smoother + bug fixes for history loading 2014-12-17 10:50:51 +01:00
iNPUTmice 80435eca5c smoothed out scrolling a bit 2014-12-17 09:32:51 +01:00
iNPUTmice 25d8546ae8 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:16:49 +01:00
Daniel Gultsch a6cfbf2f2d Merge pull request #775 from kruks23/translation1
Update spanish translations.
2014-12-15 16:57:56 +01:00
drizzt 9f6537acdc fixed typo in italian translation
s/gallaria/galleria/
2014-12-15 14:19:18 +01:00
Sam Whited a6d4b0aec5 Add quiet hours feature 2014-12-14 15:07:41 -05:00
kruks23 1ffdae80a6 Update spanish translations. 2014-12-13 13:24:17 +01:00
kruks23 920067b8ed Update spanish translations. 2014-12-09 18:33:13 +01:00
Holger Weiß b5b6589b44 Update/improve German translations 2014-12-02 18:02:17 +01:00
Daniel Gultsch 59402da60d Merge pull request #737 from kruks23/translation2
Update spanish translations
2014-12-02 00:31:24 +01:00
Daniel Gultsch 85d5326c32 Merge pull request #730 from svetlemodry/development
Updated Czech translation file
2014-12-02 00:31:13 +01:00
kruks23 2a2679cfec Update spanish translations 2014-12-01 23:16:27 +01:00
Jaroslav Lichtblau 2f34f93c3a pref_about_message string deleted 2014-12-01 21:42:37 +01:00
Jaroslav Lichtblau 59a112ebfe Updated Czech translation file
added missing strings
fixing typos, improvements for better understanding
2014-12-01 16:46:17 +01:00
iNPUTmice 21f77cd1e3 fixed italian translation 2014-12-01 09:59:39 +01:00
Elinvention e039c8de25 Removed pref_about_message which is not translatable 2014-11-30 21:51:48 +01:00
Elinvention 6b772f4141 Added missing italian translations with some minor fixes to existing ones 2014-11-30 21:16:55 +01:00
Daniel Gultsch 52a43db6d6 Merge pull request #721 from SamWhited/warning_fixes
Warning "fixes"
2014-11-29 19:14:13 +01:00
Sam Whited e43ac27e8f Accessibility: Add missing image descriptions 2014-11-29 08:03:35 -05:00
Aitor Beriain d9182fe81c Update basque translation 2014-11-27 18:33:42 +01:00
kriztan e1e28e9ef6 Update german translations
modified translations a bit
2014-11-26 11:39:40 +01:00
Daniel Gultsch 6f21dc84d5 Merge pull request #714 from betheg/muc_bookmark_cd
MUC: option to set/delete bookmark in conference details.
2014-11-24 09:31:29 +01:00
Michael 31b539daf7 MUC: option to set/delete bookmark in conference details. 2014-11-23 21:37:45 +01:00
kriztan 4d841587c8 Update german translations 2014-11-23 15:21:12 +01:00
kruks23 ca761bac3c Update spanish translations 2014-11-22 00:37:41 +01:00
iNPUTmice de0b36fc78 verify contacts key only on initiating side of smp 2014-11-21 13:42:25 +01:00
kriztan 13bb46d550 Update german translations 2014-11-20 19:20:49 +01:00
iNPUTmice 0ad6d0616f brought ad hoc conferences back. fixed #688 fixed #367 2014-11-20 18:20:42 +01:00
Daniel Gultsch 4b9a507633 Merge pull request #691 from kruks23/development
Update spanish translation
2014-11-19 17:22:57 +01:00
Daniel Gultsch 393807ab2d Merge pull request #692 from kriztan/patch-3
Update german translations
2014-11-19 17:22:50 +01:00
Aitor Beriain 24b5d0eb26 Update basque translation 2014-11-19 16:12:31 +01:00
kriztan 6847594363 Update german translations 2014-11-19 08:51:23 +01:00
kruks23 3ccee22c86 Update spanish translations 2014-11-19 00:16:45 +01:00
kruks23 8f33f3540a Update spanish translations 2014-11-18 23:53:37 +01:00
iNPUTmice 66087cb360 put error notification into notification service 2014-11-18 15:26:28 +01:00
iNPUTmice dcebc120ac show dynamic tags in contacts activity as well 2014-11-18 14:24:06 +01:00
iNPUTmice ab832bcff7 properly remove conversations context menu 2014-11-18 13:51:04 +01:00
iNPUTmice d2a4855a1e added rendered versions of new icons 2014-11-18 00:42:19 +01:00
iNPUTmice 240d2d68c8 context menu for conversations. fixed #630 2014-11-18 00:07:27 +01:00
iNPUTmice f41c3eee04 context menu for muc participants + refactor trueCounterpart to use Jid class 2014-11-17 20:02:46 +01:00
iNPUTmice 283d5058e5 synchronized around cache clear in avatar service 2014-11-17 20:01:56 +01:00
Daniel Gultsch e664a0c936 Merge pull request #680 from ferdev1/patch-2
Fix string 2
2014-11-17 18:14:50 +01:00
iNPUTmice e30e84c819 slightly modified logo / launcher icon 2014-11-17 17:23:58 +01:00
ferdev1 6c13b8a9a1 Update strings.xml 2014-11-17 17:13:20 +01:00
iNPUTmice ceecc8ffe7 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-17 01:54:19 +01:00
iNPUTmice 967cd922e1 highlight muc members by touching their name in muc details. fixed #503 2014-11-17 01:54:01 +01:00
ferdev1 c147f44cf1 Fix string 2014-11-16 18:11:14 +01:00
iNPUTmice cf00f3fade happy hanukkah 2014-11-16 17:21:21 +01:00
iNPUTmice 2067b9bd8d made scan and show qr code more accessible in VerifyOtrActivity 2014-11-16 02:10:29 +01:00
kruks23 0dc711d710 Update Spanish Translations 2014-11-15 20:48:31 +01:00
Sam Whited 251f4d6d7f Add incompatible server status 2014-11-15 11:29:58 -05:00
Sam Whited c09d450db8 Add security error status 2014-11-15 11:21:47 -05:00
iNPUTmice 35bf13f5ef Merge branch 'feature/file_transfer' into development
Conflicts:
	src/main/res/values/strings.xml
2014-11-15 15:52:15 +01:00
iNPUTmice 07b07115d6 Merge branch 'feature/foreground_service' into development
Conflicts:
	src/main/res/values/strings.xml
2014-11-15 15:51:27 +01:00
iNPUTmice 5b9c690c47 Merge branch 'feature/otr_verification' into development 2014-11-15 15:50:35 +01:00
iNPUTmice 3c6b3506e3 turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
iNPUTmice 41f7848f2c handled more error cases 2014-11-15 15:34:12 +01:00
iNPUTmice 47d44448f3 fixed description in notifications and conversation overview 2014-11-15 15:34:12 +01:00
iNPUTmice cc4f3702a8 made file transfers cancelable 2014-11-15 15:34:12 +01:00
iNPUTmice 4ab558715c adepted conversationadapter to deal with files 2014-11-15 15:34:12 +01:00
iNPUTmice e7a70a46e0 some mime and pgp fixes for file transfer 2014-11-15 15:34:12 +01:00
iNPUTmice c7acfe85c3 progress for http images as well. fixed open button for sent files 2014-11-15 15:34:12 +01:00
iNPUTmice 7a90ca429b basic arbitrary file transfer 2014-11-15 15:34:11 +01:00
Daniel Gultsch e2fb32841b Merge pull request #666 from SamWhited/localefixes
Spelling fixes
2014-11-15 13:12:29 +01:00
Sam Whited 8650bc2e13 Make licenses info untranslatable 2014-11-14 22:33:18 -05:00
Sam Whited bae2b7ddc6 Spelling fixes in Italian translation 2014-11-14 22:16:58 -05:00
Sam Whited 62404b234c Spelling fix in German translation 2014-11-14 22:13:42 -05:00
kriztan fca3e3c756 Update German language
deleted 'pref_about_message'
2014-11-12 20:09:14 +01:00
kriztan b971965697 Update German language 2014-11-12 13:13:59 +01:00
iNPUTmice e33fc26cbe added snackbar to indicate smp. more error handling in verify activity 2014-11-11 17:40:51 +01:00
iNPUTmice 6cd2ff0d88 initial smp support 2014-11-11 17:40:51 +01:00
iNPUTmice 26b4788733 formating 2014-11-09 21:27:37 +01:00
Daniel Gultsch a01ff66537 Merge pull request #645 from betheg/about_all_libs
add all used libs to the pref_about_message
2014-11-09 21:18:32 +01:00
Michael b1da9ae3cc add libidn to pref_about_message. 2014-11-09 21:02:35 +01:00
Michael f146c203a9 add all used libs to the pref_about_message.
also improve the notice a bit.
2014-11-09 13:59:38 +01:00
kruks23 6f6f15d563 Update Spanish Translations 2014-11-09 13:29:30 +01:00
iNPUTmice f8d5d6b2b5 reformated license a bit 2014-11-04 23:47:15 +01:00
Sam Whited df786cbf01 Shorten license text and fix height of scrollview 2014-11-04 13:26:48 -05:00
Sam Whited 7b67f1a19c Use normal text size and color 2014-11-04 13:17:15 -05:00
Sam Whited 55c81eaf15 Make links clickable in about text 2014-11-04 13:09:56 -05:00
Sam Whited f10dd428ba Convert about dialog to activity 2014-11-04 12:48:46 -05:00
Sam Whited 97b4b012d0 Use real copyright symbol © 2014-11-04 12:48:25 -05:00
Sam Whited df54ee75b4 Add about dialog with license info 2014-11-04 12:47:58 -05:00
iNPUTmice cd5a56e8e7 show avatar in editaccount 2014-11-04 17:38:41 +01:00
iNPUTmice b3582c970e made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
iNPUTmice d458919c8f unfinishd qr code implemenation. thanks to @emdete 2014-11-03 22:47:07 +01:00
Sam Whited 39ae34d3e6 Wrap "last seen" time.
Fixes #611
2014-11-03 08:28:20 -05:00
Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00