| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 5 | -68/+8 | |
| | | | | | | | | | | | | | already done with a more convenient method | |||||
| * | | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 2 | -11/+12 | |
| | | | | ||||||
| * | | | 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 | |
| | | | | ||||||
| * | | | Removed unnecessary dependencies to XmppConnectionService and added ↵ | steckbrief | 2016-02-23 | 4 | -43/+7 | |
| | | | | | | | | | | | | | allowMessageCorrection to preferences | |||||
| * | | | Merge tag '1.10.0' into trz/merge_1.10.0 | lookshe | 2016-02-22 | 22 | -144/+509 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | 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 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 4 | -3/+13 | |
| | | | | | | | | | | | | | 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 | 10 | -39/+200 | |
| | | | | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | 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 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | optional mode to close tcp connection when going into background | Daniel Gultsch | 2016-02-14 | 3 | -29/+63 | |
| | | | | | | | | | | | | | acts only when push is available. disable all non-push accounts to test properly | |||||
| | * | | send push enable to server. simplified logging | Daniel Gultsch | 2016-02-13 | 3 | -2/+22 | |
| | | | | ||||||
| | * | | fixed compile bug in free version | Daniel Gultsch | 2016-02-13 | 2 | -3/+3 | |
| | | | | ||||||
| | * | | push gcm token on bind instead of every connect | Daniel Gultsch | 2016-02-12 | 1 | -5/+3 | |
| | | | | ||||||
| | * | | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 5 | -15/+60 | |
| | | | | ||||||
| * | | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4 | lookshe | 2016-02-16 | 25 | -226/+880 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml | |||||
| | * | | catch all axolotl parse exception at once. fixes #1692 | Daniel Gultsch | 2016-02-11 | 1 | -5/+4 | |
| | | | | ||||||
| | * | | send muc messages after join | Daniel Gultsch | 2016-02-10 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | allow user to set MAM preferences | Daniel Gultsch | 2016-02-09 | 2 | -1/+90 | |
| | | | | ||||||
| | * | | prepend instead off append mam messages to conversations when going in reverse | Daniel Gultsch | 2016-02-04 | 2 | -2/+13 | |
| | | | | ||||||
| | * | | fixed performance regression in on scroll listener | Daniel Gultsch | 2016-02-04 | 2 | -3/+8 | |
| | | | | ||||||
| | * | | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 7 | -17/+82 | |
| | | | | ||||||
| | * | | add more fault tolerant checks for messages left on server | Daniel Gultsch | 2016-02-04 | 3 | -7/+21 | |
| | | | | ||||||
| | * | | removed unecessary logging when muc tiles update | Daniel Gultsch | 2016-02-04 | 1 | -1/+0 | |
| | | | | ||||||
| | * | | use TLSv1.2 as SSL context on supported plattforms | Daniel Gultsch | 2016-02-03 | 3 | -2/+14 | |
| | | | | ||||||
| | * | | cache server caps | Daniel Gultsch | 2016-02-03 | 3 | -3/+36 | |
| | | | | ||||||
| | * | | count all messages in a query | Daniel Gultsch | 2016-02-03 | 2 | -8/+3 | |
| | | | | ||||||
| | * | | Revert "get rid of broken totalMessageCount for mam queries" | Daniel Gultsch | 2016-02-03 | 2 | -4/+16 | |
| | | | | | | | | | | | | | This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f. | |||||
| | * | | refactored disco cache. avoid making duplicate call. check hash | Daniel Gultsch | 2016-02-03 | 6 | -43/+116 | |
| | | | | ||||||
| | * | | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵ | Daniel Gultsch | 2016-02-02 | 11 | -152/+467 | |
| | |\ \ | | | | | | | | | | | | | into singpolyma-disco-caps | |||||
| | | * | | Do disco for caps hashes we have never seen | Stephen Paul Weber | 2016-01-24 | 1 | -2/+23 | |
| | | | | | | | | | | | | | | | | | Then cache it | |||||
| | | * | | Fetch cached caps result on new presence | Stephen Paul Weber | 2016-01-24 | 2 | -3/+14 | |
| | | | | | ||||||
| | | * | | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 8 | -102/+121 | |
| | | | | | | | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |