aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
| * | version bump to 1.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
| |\ \
| * | | 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
* | | | Update CHANGELOG.mdChristian S2016-01-311-0/+2
* | | | Merge branch 'siacs/master'Christian S2016-01-3120-75/+459
|\ \ \ \ | | |/ / | |/| |
| * | | Update README.mdDaniel Gultsch2016-01-311-1/+1
| |/ /
| * | 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
| * | show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-266-7/+58
| * | hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-255-11/+48
| * | changed FileBackend API to allow files instead of messages to be copied and r...Daniel Gultsch2016-01-241-33/+34
| * | added FormWrapper and form field validationDaniel Gultsch2016-01-238-4/+160
| |/
| * introduced boolean form field wrapperDaniel Gultsch2016-01-236-14/+76
| * added support for field types jid-single and text-privateDaniel Gultsch2016-01-234-4/+59
| * reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-232-1/+15
* | Merge branch 'siacs/master' into developmentChristian S2016-01-2331-149/+362
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-2213-70/+52
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-226-1/+161
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-224-5/+7
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-225-23/+43
| * increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| * add convenience to get an account object from a spinnerDaniel Gultsch2016-01-211-15/+19
| * version bump to 1.9.2 + changelogDaniel Gultsch2016-01-202-2/+9
| * pulled translations from transifexDaniel Gultsch2016-01-2015-13/+718
| * catch security exception when user prevents access to address bookDaniel Gultsch2016-01-201-27/+45
| * add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
* | make actionbar title/subtitle clickableChristian S2016-01-233-26/+104
* | show warning on back pressed during update checkChristian S2016-01-223-2/+24
* | hide 'disable foreground service' in foreground notificationChristian S2016-01-201-3/+0
* | possible fix for showing link instead of button for filesChristian S2016-01-191-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-176-102/+32
|\|
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-162-2/+5
| |\
| | * Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-162-2/+5
| | |\
| | | * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| | | * upgraded to OpenKeychain api v10Adithya Abraham Philip2016-01-161-1/+1
| * | | pulled translations from transifexDaniel Gultsch2016-01-164-3/+49
| |/ /