aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-119-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 standardsteckbrief2016-03-119-138/+13
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-118-149/+28
|\| | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-106-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 endsteckbrief2016-03-103-37/+45
| |
| * Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-103-12/+6
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|\| | | | | | | | | Conflicts: build.gradle
| * Merge remote branch 'master'steckbrief2016-03-083-21/+20
| |\
| * | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
| | |
* | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-083-21/+20
|\ \ \ | | |/ | |/|
| * | reset link and highlight colors to system defaultsteckbrief2016-03-083-21/+20
| |/
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0869-608/+1193
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
| |\
| * \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-079-22/+49
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06302-5778/+20658
| |\ \ \
* | | | | Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-081-6/+31
| | | | |
* | | | | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0steckbrief2016-03-081-1/+1
| | | | |
* | | | | Fixed merge issue with AxolotlService (differentiation between impl and ↵steckbrief2016-03-083-133/+171
| | | | | | | | | | | | | | | | | | | | interface)
* | | | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0866-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 transifexDaniel Gultsch2016-03-0628-82/+272
| | | | |
| * | | | don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-063-4/+17
| | | | |
| * | | | warn in conversations when account is disabledDaniel Gultsch2016-03-062-1/+15
| | | | |
| * | | | Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵Daniel Gultsch2016-03-041-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | tarun018-Mess
| | * | | | Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-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 checkerDaniel Gultsch2016-03-042-1/+15
| | | | | |
| * | | | | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| | | | | |
| * | | | | don't automatically crop avatarDaniel Gultsch2016-03-048-22/+49
| | | | | |
| * | | | | add a few more know file extensionsDaniel Gultsch2016-03-044-10/+13
| | | | | |
| * | | | | allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
| | | | | |
| * | | | | moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| | | | | |
| * | | | | avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| | | | | |
| * | | | | don't break with srcoll events on empty message listsDaniel Gultsch2016-03-031-2/+7
| | | | | |
| * | | | | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-014-7/+26
| | | | | |
| * | | | | removed unused config variableDaniel Gultsch2016-03-011-4/+0
| | | | | |
| * | | | | properly persist accepted crypto targetsDaniel Gultsch2016-03-011-5/+1
| | | | | |
| * | | | | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-016-52/+137
| | | | | | | | | | | | | | | | | | | | | | | | already trusted
| * | | | | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-292-6/+6
| | | | | |
| * | | | | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-2912-173/+320
| | | | | |
| * | | | | rename purge keys positive button to 'purge keys'Daniel Gultsch2016-02-281-1/+1
| | | | | |
| * | | | | made hashtable in roster store jids instead of stringsDaniel Gultsch2016-02-281-9/+7
| | | | | |
| * | | | | always search offline contacts as well. fixes #1653Daniel Gultsch2016-02-271-0/+1
| | | | | |
| * | | | | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-02-273-1/+34
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-273-1/+34
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M
| | | * | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= Mfiaxh2016-02-242-0/+33
| | | | | | | |
| | | * | | | | No possibility of multiple invocation of log exportfiaxh2016-02-241-1/+1
| | | | | | | |
| * | | | | | | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-278-8/+29
| |/ / / / / /
* | | | | | / use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-074-5/+6
| | | | | |
* | | | | | corrected getRealPathFromUrilookshe2016-03-072-4/+43
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 07:20:00 +0000