| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | Merge pull request #1715 from fiaxh/gpg_decryption_failed | Daniel Gultsch | 2016-02-24 | 5 | -2/+21 | |
| | | |\ \ | | | | | | | | | | | PGP Retry decryption from message menu | |||||
| | | | * | | Retry decryption from message menu | fiaxh | 2016-02-23 | 5 | -2/+21 | |
| | | | |/ | ||||||
| | | * | | set noMessagesLeftOnServer before conference configuration fetch | Daniel Gultsch | 2016-02-23 | 2 | -2/+2 | |
| | | | | | ||||||
| | | * | | update notification after message correction | Daniel Gultsch | 2016-02-23 | 1 | -0/+1 | |
| | | | | | ||||||
| | | * | | reset pending subscription request when receiving roster update | Daniel Gultsch | 2016-02-23 | 1 | -0/+2 | |
| | | | | | ||||||
| | | * | | made presences object final in contact | Daniel Gultsch | 2016-02-23 | 1 | -5/+1 | |
| | | |/ | ||||||
| | | * | properly trigger show load more messages in mucs | Daniel Gultsch | 2016-02-22 | 1 | -2/+10 | |
| | | | | ||||||
| | | * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 6 | -39/+54 | |
| | | | | ||||||
| | * | | Fixes FS#48 and FS#136trz/merge_1.10.0 | lookshe | 2016-02-28 | 5 | -24/+3 | |
| | | | | | | | | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage | |||||
| | * | | Unused imports / methods removed | steckbrief | 2016-02-24 | 3 | -27/+0 | |
| | | | | ||||||
| | * | | Fixes FS#89 after merge conflict | steckbrief | 2016-02-24 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵ | steckbrief | 2016-02-24 | 2 | -11/+1 | |
| | | | | | | | | | | | | | for auto downloading image links moved to global Utility Class) | |||||
| | * | | Readded MessageDetailsDialog to message context menu after merge | steckbrief | 2016-02-24 | 1 | -0/+4 | |
| | | | | ||||||
| | * | | Reviewed commit for FS#34 after merge | steckbrief | 2016-02-24 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Packet sending helper moved to XmppSendUtil and methods in ↵ | steckbrief | 2016-02-23 | 2 | -18/+17 | |
| | | | | | | | | | | | | | XmppConnectionService marked as deprecated | |||||
| | * | | Removed stupid message correction | steckbrief | 2016-02-23 | 34 | -167/+10 | |
| | | | | ||||||
| | * | | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 21 | -92/+8 | |
| | | | | | | | | | | | | | already done with a more convenient method | |||||
| | * | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 3 | -14/+15 | |
| | | | | ||||||
| | * | | Removed non-existing member variable | steckbrief | 2016-02-23 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix visibility of updateStatusMessages method that LoadMoreMessages can work | steckbrief | 2016-02-23 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) | steckbrief | 2016-02-23 | 1 | -0/+15 | |
| | | | | ||||||
| | * | | Removed unnecessary dependencies to XmppConnectionService and added ↵ | steckbrief | 2016-02-23 | 5 | -43/+11 | |
| | | | | | | | | | | | | | allowMessageCorrection to preferences | |||||
| | * | | merged string resources | steckbrief | 2016-02-23 | 2 | -6/+0 | |
| | | | | ||||||
| | * | | Merge tag '1.10.0' into trz/merge_1.10.0 | lookshe | 2016-02-22 | 88 | -346/+2431 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.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/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml | |||||
| | | * | show load more messages when auto loading is disabled and messages are still ↵ | Daniel Gultsch | 2016-02-21 | 2 | -6/+14 | |
| | | | | | | | | | | | | | left on server | |||||
| | | * | check for uuid change when decrypting pgp messages | Daniel Gultsch | 2016-02-21 | 1 | -7/+6 | |
| | | | | ||||||
| | | * | some mucs may grant voice to visitors in unmoderated rooms | Daniel Gultsch | 2016-02-21 | 1 | -1/+3 | |
| | | | | ||||||
| | | * | pulled translations from transifex | Daniel Gultsch | 2016-02-20 | 2 | -0/+49 | |
| | | | | ||||||
| | | * | change uuid when replacing messages | Daniel Gultsch | 2016-02-20 | 2 | -1/+9 | |
| | | | | ||||||
| | | * | decrypt pgp message corrections | Daniel Gultsch | 2016-02-19 | 1 | -8/+9 | |
| | | | | ||||||
| | | * | skip avatar ui when pep is not available. fixes #1706 | Daniel Gultsch | 2016-02-19 | 1 | -5/+5 | |
| | | | | ||||||
| | | * | don't reset whisper on reInit. fixes #1637 | Daniel Gultsch | 2016-02-19 | 1 | -3/+0 | |
| | | | | ||||||
| | | * | pulled translations from transifex | Daniel Gultsch | 2016-02-19 | 29 | -253/+212 | |
| | | | | ||||||
| | | * | never parse show in presences as offline | Daniel Gultsch | 2016-02-19 | 2 | -12/+16 | |
| | | | | ||||||
| | | * | don't log start reason | Daniel Gultsch | 2016-02-17 | 1 | -1/+0 | |
| | | | | ||||||
| | | * | only offer message correction for the very last message | Daniel Gultsch | 2016-02-17 | 4 | -8/+37 | |
| | | | | ||||||
| | | * | fixed regression that caused messages in muc not being send | Daniel Gultsch | 2016-02-17 | 2 | -7/+8 | |
| | | | | ||||||
| | | * | log reason why otr message won't be parsed | Daniel Gultsch | 2016-02-16 | 1 | -1/+2 | |
| | | | | ||||||
| | | * | fixed regression that caused ui to redraw a lot | Daniel Gultsch | 2016-02-16 | 1 | -4/+8 | |
| | | | | ||||||
| | | * | made clear that archiving preferences are server side | Daniel Gultsch | 2016-02-16 | 2 | -5/+5 | |
| | | | | ||||||
| | | * | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 6 | -19/+36 | |
| | | | | | | | | | | | | | options to settings | |||||
| | | * | added some OTR logging | Daniel Gultsch | 2016-02-16 | 2 | -5/+14 | |
| | | | | ||||||
| | | * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 42 | -41/+228 | |
| | | | | ||||||
| | | * | removed unnecessary conditions when sending read marker | Daniel Gultsch | 2016-02-15 | 1 | -5/+1 | |
| | | | | ||||||
| | | * | add missing type='submit' attribute to enable push form | Daniel Gultsch | 2016-02-15 | 1 | -0/+1 | |
| | | | | ||||||
| | | * | pulled translations from transifex | Daniel Gultsch | 2016-02-15 | 11 | -9/+656 | |
| | | | | ||||||
| | | * | only show load more messages button when mam is available | Daniel Gultsch | 2016-02-14 | 2 | -1/+6 | |
| | | | | | | | | | | | | | also update ui after that button has been pressed. fixes #1695 | |||||
| | | * | fixed server info push not showing up when unavailable | Daniel Gultsch | 2016-02-14 | 3 | -4/+12 | |
| | | | | ||||||
| | | * | be more carefull when checking push availability | Daniel Gultsch | 2016-02-14 | 1 | -1/+3 | |
| | | | | ||||||
| | | * | deleted invalid gcm strings | Daniel Gultsch | 2016-02-14 | 1 | -5/+0 | |
| | | | | ||||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |