aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * count all messages in a queryDaniel Gultsch2016-02-032-8/+3
| | * Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-032-4/+16
| | * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-036-43/+116
| | * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-0211-152/+467
| | |\
| | | * Do disco for caps hashes we have never seenStephen Paul Weber2016-01-241-2/+23
| | | * Fetch cached caps result on new presenceStephen Paul Weber2016-01-242-3/+14
| | | * Use a Presence class for presence informationStephen Paul Weber2016-01-248-102/+121
| | | * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-232-11/+98
| | | * Implement toJSON on ServiceDiscoveryResultStephen Paul Weber2016-01-231-0/+34
| | | * Generate capHash from any discovery resultStephen Paul Weber2016-01-231-4/+80
| | | * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-232-47/+114
| | * | fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
| | * | get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-022-16/+4
| | * | re-read common name from certificates on startupDaniel Gultsch2016-02-022-2/+32
| | * | avoid npe when accessing the pgp connection serviceDaniel Gultsch2016-02-021-1/+1
| | * | catch a few NPE when parsing invalid pep nodesDaniel Gultsch2016-02-021-3/+3
| * | | Fixes FS#105: XHTML par for images addedtrz/merge_1.9.3steckbrief2016-02-131-0/+12
| * | | Fix flagging no more messages on server for conversationsteckbrief2016-02-131-16/+18
| * | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-02-131-2/+13
| * | | Partially implements FS#6: Conference ID changed to c+bugs@conference.thedevs...steckbrief2016-02-131-2/+2
| * | | Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-131-1/+1
| * | | Unused preference 'picture_compression'. This feature is configured in our va...steckbrief2016-02-1320-56/+0
| * | | Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...steckbrief2016-02-136-79/+5
| * | | Fixed settings synchronizationsteckbrief2016-02-121-60/+66
| * | | Imports organizedsteckbrief2016-02-1273-293/+56
| * | | Fixed parent activity for logoutput activitysteckbrief2016-02-121-3/+3
| * | | Simplification of DNS requests.steckbrief2016-02-123-254/+130
| * | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-1224-67/+5
| * | | Fixed placeholder string for message input boxsteckbrief2016-02-122-2/+2
| * | | Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
| * | | Fixed NPE while loading messages via MAMsteckbrief2016-02-121-1/+1
| * | | Fixed runtime errors with axolotl libraries.steckbrief2016-02-126-0/+1
| * | | database error while upgrading from db version 14 fixedsteckbrief2016-02-121-1/+1
| * | | axolotl resources changed from maven to jcentersteckbrief2016-02-125-2/+2
| * | | Compilation errors and merge mixups fixedsteckbrief2016-02-1124-728/+358
| * | | Some runtime dependencies addedsteckbrief2016-02-113-1/+4
| * | | Fixed XML errors after mergesteckbrief2016-02-116-8/+14
| * | | Fixed third party library references in gradlesteckbrief2016-02-1126-54/+11
| * | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-11326-7202/+20503
| |\| |
| | * | version bump to 1.9.31.9.3Daniel Gultsch2016-02-012-2/+8
| | * | respect autojoin setting on newly created bookmarks as wellDaniel Gultsch2016-02-011-1/+1
| | * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-015-5/+20
| | * | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-02-011-1/+1
| | |\ \
| | | * | Update README.mdDaniel Gultsch2016-01-311-1/+1
| | * | | made create context menu call in StartConversationsActivity more failsafeDaniel Gultsch2016-02-011-1/+1
| | * | | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-014-86/+70
| | * | | fixed false set of subject in conference with empty body tagDaniel Gultsch2016-01-311-1/+1
| | * | | prefer dns servers from networsk with the default routeDaniel Gultsch2016-01-291-2/+17
| | |/ /
| | * | be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
| | * | try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10