aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2015-01-292-8/+24
|\
| * Use Material Design Icons on API 21+Sam Whited2015-01-292-8/+24
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2015-01-291-10/+10
|\|
| * Merge pull request #941 from SamWhited/snackbar_orderingDaniel Gultsch2015-01-281-10/+10
| |\
| | * Show errors before mute snackbarSam Whited2015-01-271-10/+10
* | | properly clear notifications. fixed #921iNPUTmice2015-01-291-2/+8
|/ /
* / fixed broken capsiNPUTmice2015-01-282-14/+17
|/
* muc tics for consistencyiNPUTmice2015-01-261-1/+1
* changed version code and version name to 1.0-beta2iNPUTmice2015-01-261-1/+1
* adapt caps on whether or not message confirmation is oniNPUTmice2015-01-265-11/+31
* don't put ejabberds status code muc messages into an actual conversationiNPUTmice2015-01-261-0/+1
* made connect time out more failsaveiNPUTmice2015-01-251-5/+8
* Merge pull request #930 from betheg/otrDaniel Gultsch2015-01-252-0/+3
|\
| * otr: switch to the otr-state the partner alternate.Michael2015-01-252-0/+3
* | Merge pull request #933 from betheg/mergeableDaniel Gultsch2015-01-253-5/+9
|\ \
| * | fix mergable() for /me command.Michael2015-01-253-5/+9
| |/
* / set jingle file transfer to offer after iq offer has returnediNPUTmice2015-01-251-6/+17
|/
* 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 primaryAnders Sandblad2015-01-232-1/+5
* | fixed mam to work with muciNPUTmice2015-01-244-11/+21
|/
* show checkbox to hide offline contactsiNPUTmice2015-01-211-6/+19
* 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-214-72/+82
* Add block/unblock to contact details menuSam Whited2015-01-213-9/+15
* Merge pull request #908 from betheg/otr4jDaniel Gultsch2015-01-213-2/+8
|\
| * otr4j: update to 0.22Michael2015-01-203-2/+8
* | 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
|/
* Remove legacy SSL supportSam Whited2015-01-191-15/+11
* don't trim bodiesiNPUTmice2015-01-191-1/+1
* fixed legacy translation of image receivediNPUTmice2015-01-191-1/+3
* added changelog for 1.0iNPUTmice2015-01-191-1/+1
* 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-181-0/+8
* explain read markeriNPUTmice2015-01-181-20/+6
* use same helper methods for images and filesiNPUTmice2015-01-182-54/+16
* Merge pull request #899 from SamWhited/api21_notificationsDaniel Gultsch2015-01-181-0/+4
|\
| * Add some Android 21 notification featuresSam Whited2015-01-171-0/+4
* | Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+4
|\ \
| * | Added new file type names for file transfersChristian S2015-01-181-0/+4
| |/
* / Fix string substitutions with unknown filetypesSam Whited2015-01-171-2/+2
|/
* Correct the download file string on notificationsSam Whited2015-01-172-15/+14
* Add download button on notification if applicableSam Whited2015-01-163-29/+70
* sending read marker when resuming activity and conversation is openiNPUTmice2015-01-151-1/+4