aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #927 from betheg/otr_query_messageDaniel Gultsch2015-01-251-1/+1
|\ | | | | MessageParser: fix the regex for otr query messages.
| * MessageParser: fix the regex for otr query messages.Michael2015-01-241-1/+1
|/
* Merge pull request #924 from andersruneson/changeonlinecolorDaniel Gultsch2015-01-242-1/+5
|\ | | | | Changed online color to green instead of primary
| * Changed online color to green instead of primaryAnders Sandblad2015-01-232-1/+5
| |
* | fixed mam to work with muciNPUTmice2015-01-244-11/+21
| |
* | mentioned hide offline feature in the changelogiNPUTmice2015-01-221-0/+1
|/
* show checkbox to hide offline contactsiNPUTmice2015-01-213-6/+28
|
* fixed bug in find conference in database methodiNPUTmice2015-01-211-3/+6
|
* deal with user entering full jids in join conference dialogiNPUTmice2015-01-212-3/+4
|
* always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-216-84/+89
|
* Add block/unblock to contact details menuSam Whited2015-01-214-9/+28
| | | | See #889
* Merge pull request #908 from betheg/otr4jDaniel Gultsch2015-01-214-3/+9
|\ | | | | otr4j: update to 0.22
| * otr4j: update to 0.22Michael2015-01-204-3/+9
| |
* | Merge pull request #912 from SamWhited/update-foreground-notificationDaniel Gultsch2015-01-211-7/+14
|\ \ | | | | | | Add color / category to foreground notification
| * | Add color / category to foreground notificationSam Whited2015-01-201-7/+14
|/ /
* | changed message duplicate finderiNPUTmice2015-01-201-5/+10
| |
* | fixed missing image previewiNPUTmice2015-01-201-1/+1
| |
* | fixed up button on v21 devicesiNPUTmice2015-01-201-2/+6
|/
* Fixed action bar search for Android 5.0iNPUTmice2015-01-201-4/+4
|
* Merge pull request #905 from svetlemodry/developmentDaniel Gultsch2015-01-201-406/+420
|\ | | | | Czech translation updated
| * Czech translation updatedJaroslav Lichtblau2015-01-191-406/+420
|/ | | | for Conversations
* Merge pull request #904 from SamWhited/remove-sslDaniel Gultsch2015-01-1912-30/+12
|\ | | | | Remove legacy SSL support
| * Remove legacy SSL supportSam Whited2015-01-1912-30/+12
|/
* don't trim bodiesiNPUTmice2015-01-191-1/+1
|
* fetched translations from transifexiNPUTmice2015-01-1914-4159/+4412
|
* fixed legacy translation of image receivediNPUTmice2015-01-191-1/+3
|
* added changelog for 1.0iNPUTmice2015-01-193-3/+10
|
* check for deleted files when loading more messages from historyiNPUTmice2015-01-191-1/+3
|
* account for rounding errors when rescheduling wake upiNPUTmice2015-01-191-150/+153
|
* fixed bug when sharing files from google driveiNPUTmice2015-01-181-7/+11
|
* proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-182-0/+10
|
* explain read markeriNPUTmice2015-01-182-20/+19
|
* use same helper methods for images and filesiNPUTmice2015-01-183-61/+19
|
* Merge pull request #899 from SamWhited/api21_notificationsDaniel Gultsch2015-01-181-0/+4
|\ | | | | Add some Android 21 notification features
| * Add some Android 21 notification featuresSam Whited2015-01-171-0/+4
| |
* | Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-182-0/+6
|\ \ | | | | | | Added new file type names for file transfers
| * | Added new file type names for file transfersChristian S2015-01-182-0/+6
| |/ | | | | | | | | - apk - vcard
* | Merge pull request #898 from SamWhited/unknown_filetype_string_fixDaniel Gultsch2015-01-182-2/+3
|\ \ | |/ |/| Fix string substitutions with unknown filetypes
| * Fix string substitutions with unknown filetypesSam Whited2015-01-172-2/+3
|/
* Merge pull request #897 from SamWhited/download_file_fixesDaniel Gultsch2015-01-178-24/+18
|\ | | | | Correct the download file string on notifications
| * Correct the download file string on notificationsSam Whited2015-01-178-24/+18
|/ | | | Fixes #896
* Merge branch 'SamWhited-download-button-notification' into developmentiNPUTmice2015-01-168-29/+71
|\
| * Add download button on notification if applicableSam Whited2015-01-168-29/+71
|/
* sending read marker when resuming activity and conversation is openiNPUTmice2015-01-151-1/+4
|
* show toast when avatar has been published - fixed #874iNPUTmice2015-01-152-13/+14
|
* added dedicated button to disable foreground service in perma notificationiNPUTmice2015-01-156-3/+11
|
* fixed #888iNPUTmice2015-01-151-1/+1
|
* Merge pull request #886 from rtreffer/developmentDaniel Gultsch2015-01-1424-2949/+1
|\ | | | | Switch to maven central minidns
| * Switch to maven central minidnsRene Treffer2015-01-1424-2949/+1
| |
* | Merge pull request #885 from SamWhited/display-enter-keyDaniel Gultsch2015-01-145-26/+52
|\ \ | | | | | | Add option to swap enter/emoticon key