aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| * 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 + changelog1.9.2Daniel 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
| * 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