| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-30 | 1 | -1/+1 |
| |\ | |||||
| | * | no resize of input field when inserting emojicon (FS#175) | lookshe | 2016-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 1 | -1/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java | ||||
| | * | Implements FS#173: Move access to colors to separate helper class | steckbrief | 2016-03-29 | 1 | -1/+13 |
| | | | |||||
| * | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-27 | 1 | -0/+4 |
| |\| | |||||
| | * | Fixes FS#166 - Images cannot be opened since storing in private image folder | lookshe | 2016-03-27 | 1 | -0/+4 |
| | | | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-25 | 2 | -1/+5 |
| | |\ | |/ |/| | |||||
| * | | FS#169 - Merge Conversations 1.11.2 into Conversations+ dev | lookshe | 2016-03-25 | 2 | -1/+5 |
| |\ \ | |||||
| | * | | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 2 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-23 | 32 | -317/+450 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | pulled from transifex | lookshe | 2016-03-23 | 32 | -317/+450 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 7 | -4/+15 |
| |\| | | |||||
| | * | | Fixes FS#143 - Displaying of emoticons too large | lookshe | 2016-03-20 | 7 | -4/+15 |
| | | | | |||||
| | * | | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 6 | -105/+438 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1 | lookshe | 2016-03-20 | 1 | -1/+2 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -1/+2 |
| | |\| | | |||||
| | | * | | Refs FS#140: Rework message display | steckbrief | 2016-03-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | hide own avatar in message display | ||||
| * | | | | Merge tag '1.11.1' into trz/merge_1.11.1 | lookshe | 2016-03-17 | 6 | -105/+438 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml | ||||
| | * | | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
| | * | | pulled translations from transifex | Daniel Gultsch | 2016-03-13 | 5 | -106/+443 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 6 | -62/+3 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | 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 | 6 | -61/+3 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 1 | -8/+0 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
| | * | | Fixes FS#158: user decision dialog heading configurable and translateable | steckbrief | 2016-03-10 | 1 | -8/+0 |
| | | | | |||||
| * | | | 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 | 2 | -4/+0 |
| | |\ \ | |||||
| | * | | | 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 | 2 | -4/+0 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | reset link and highlight colors to system default | steckbrief | 2016-03-08 | 2 | -4/+0 |
| | |/ / | |||||
| | * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 38 | -131/+319 |
| | |\ \ | |/ / |/| | | |||||
| | * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-07 | 2 | -9/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 167 | -2197/+7492 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge tag '1.11.0' into trz/merge_1.11.0 | lookshe | 2016-03-08 | 38 | -131/+319 |
| |\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |||||
| | * | | | warn in conversations when account is disabled | Daniel Gultsch | 2016-03-06 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | show host in file size checker | Daniel Gultsch | 2016-03-04 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 7 | -0/+9 |
| | | | | | |||||
| | * | | | expert option to treat vibrate as silent mode for XA. fixes #1530 | Daniel Gultsch | 2016-03-01 | 2 | -0/+8 |
| | | | | | |||||
| | * | | | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 2 | -26/+35 |
| | | | | | | | | | | | | | | | | | already trusted | ||||
| | * | | | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 2 | -26/+34 |
| | | | | | |||||
| * | | | | Finally fixes FS#142 | lookshe | 2016-03-07 | 2 | -9/+0 |
| | |_|/ |/| | | |||||
| * | | | Fixes FS#147: Disable OMEMO | steckbrief | 2016-03-02 | 5 | -3/+16 |
| | | | | |||||
| * | | | Fixes FS#146: Remove Tor-Support | steckbrief | 2016-03-02 | 24 | -72/+2 |
| | | | | |||||
| * | | | externalized string 'Retry decryption'trz/merge_1.10.1 | steckbrief | 2016-02-28 | 3 | -1/+3 |
| | | | | |||||
| * | | | Merge tag '1.10.1' into trz/merge_1.10.1 | steckbrief | 2016-02-28 | 3 | -4/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml | ||||
| | * | | disallow message correction by default. fixes #1720 | Daniel Gultsch | 2016-02-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | optionally lock conference domains as well and hide known domains in ui | Daniel Gultsch | 2016-02-24 | 1 | -0/+2 |
| | | | | |||||
| | * | | Retry decryption from message menu | fiaxh | 2016-02-23 | 2 | -1/+4 |
| | | | | |||||
| | * | | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 1 | -2/+3 |
| | | | | |||||
| * | | | Fixes FS#89 after merge conflict | steckbrief | 2016-02-24 | 1 | -3/+6 |
| | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |