| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-15 | 2 | -4/+4 |
| |\ | |||||
| | * | once again: FS#34 - review all calls for String.trim() | lookshe | 2016-03-14 | 2 | -4/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 5 | -97/+16 |
| |\| | |||||
| | * | Fixes FS#155: Check FileHelper vs. FileUtils | steckbrief | 2016-03-12 | 5 | -97/+16 |
| | | | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-12 | 7 | -55/+93 |
| | |\ | |/ |/| | |||||
| * | | fixed possible NPE | lookshe | 2016-03-12 | 1 | -0/+6 |
| | | | |||||
| * | | small bugfixes | lookshe | 2016-03-12 | 2 | -1/+4 |
| | | | |||||
| * | | removed duplicated source | lookshe | 2016-03-12 | 4 | -36/+41 |
| | | | |||||
| * | | Added method to get body from message if hasMeCommand and harmonized ↵ | lookshe | 2016-03-12 | 6 | -44/+67 |
| | | | | | | | | | extraction of fileextension (FS#38) | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 9 | -139/+14 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml | ||||
| | * | Fixes FS#51: Change toggle in Account Management back to standard | steckbrief | 2016-03-11 | 9 | -138/+13 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 8 | -149/+28 |
| |\| | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | ||||
| | * | Fixes FS#139: Do not merge messages at all | steckbrief | 2016-03-11 | 8 | -149/+28 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 6 | -49/+52 |
| |\| | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
| | * | Fixes FS#157: Trigger loading messages from MAM in MUC does not end | steckbrief | 2016-03-10 | 3 | -37/+45 |
| | | | |||||
| | * | Fixes FS#158: user decision dialog heading configurable and translateable | steckbrief | 2016-03-10 | 3 | -12/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-08 | 1 | -1/+2 |
| |\| | | | | | | | | | Conflicts: build.gradle | ||||
| | * | Merge remote branch 'master' | steckbrief | 2016-03-08 | 3 | -21/+20 |
| | |\ | |||||
| | * | | Fixes FS#145: Dialog for decision in Android 5 | steckbrief | 2016-03-08 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1 | lookshe | 2016-03-08 | 3 | -21/+20 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | reset link and highlight colors to system default | steckbrief | 2016-03-08 | 3 | -21/+20 |
| | |/ | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 69 | -608/+1193 |
| | |\ | |/ |/| | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 1 | -1/+2 |
| | |\ | |||||
| | * \ | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-07 | 9 | -22/+49 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 302 | -5778/+20658 |
| | |\ \ \ | |||||
| * | | | | | Fixes FS#153 - Check if url, phone and email are linkified correctly | lookshe | 2016-03-08 | 1 | -6/+31 |
| | | | | | | |||||
| * | | | | | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0 | steckbrief | 2016-03-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed merge issue with AxolotlService (differentiation between impl and ↵ | steckbrief | 2016-03-08 | 3 | -133/+171 |
| | | | | | | | | | | | | | | | | | | | | | interface) | ||||
| * | | | | | Merge tag '1.11.0' into trz/merge_1.11.0 | lookshe | 2016-03-08 | 66 | -471/+987 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml | ||||
| | * | | | | pulled translations from transifex | Daniel Gultsch | 2016-03-06 | 28 | -82/+272 |
| | | | | | | |||||
| | * | | | | don't show opt-out of battery optimization dialog when push is enabled | Daniel Gultsch | 2016-03-06 | 3 | -4/+17 |
| | | | | | | |||||
| | * | | | | warn in conversations when account is disabled | Daniel Gultsch | 2016-03-06 | 2 | -1/+15 |
| | | | | | | |||||
| | * | | | | Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵ | Daniel Gultsch | 2016-03-04 | 1 | -0/+10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | tarun018-Mess | ||||
| | | * | | | | Fix Issue #1634 : Shows XMPP URI as links. | Tarun | 2016-02-29 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI. | ||||
| | * | | | | | show host in file size checker | Daniel Gultsch | 2016-03-04 | 2 | -1/+15 |
| | | | | | | | |||||
| | * | | | | | mark oob messages and always display download button | Daniel Gultsch | 2016-03-04 | 4 | -6/+30 |
| | | | | | | | |||||
| | * | | | | | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 8 | -22/+49 |
| | | | | | | | |||||
| | * | | | | | add a few more know file extensions | Daniel Gultsch | 2016-03-04 | 4 | -10/+13 |
| | | | | | | | |||||
| | * | | | | | allow to copy original url even while downloading. fixes #1743 | Daniel Gultsch | 2016-03-04 | 1 | -6/+9 |
| | | | | | | | |||||
| | * | | | | | moved avatarfetcher reset code to bind | Daniel Gultsch | 2016-03-03 | 1 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | avoid unnecessary disconnect. prevent NetworkOnMainThreadException | Daniel Gultsch | 2016-03-03 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | don't break with srcoll events on empty message lists | Daniel Gultsch | 2016-03-03 | 1 | -2/+7 |
| | | | | | | | |||||
| | * | | | | | expert option to treat vibrate as silent mode for XA. fixes #1530 | Daniel Gultsch | 2016-03-01 | 4 | -7/+26 |
| | | | | | | | |||||
| | * | | | | | removed unused config variable | Daniel Gultsch | 2016-03-01 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | properly persist accepted crypto targets | Daniel Gultsch | 2016-03-01 | 1 | -5/+1 |
| | | | | | | | |||||
| | * | | | | | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 6 | -52/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | already trusted | ||||
| | * | | | | | use correct jid when leaving a conference. fixes #1732 | Daniel Gultsch | 2016-02-29 | 2 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 12 | -173/+320 |
| | | | | | | | |||||
| | * | | | | | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | made hashtable in roster store jids instead of strings | Daniel Gultsch | 2016-02-28 | 1 | -9/+7 |
| | | | | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |