aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #949 from kruks23/title_activityDaniel Gultsch2015-02-0115-16/+2
| |\
| | * Remove title_activity_conversations and use app_name insteadkruks232015-01-3015-16/+2
| |/
| * made version codes ready for release candidate in beta channeliNPUTmice2015-01-292-3/+3
| * don't count when attempt failed completlyiNPUTmice2015-01-291-0/+1
| * Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2015-01-29145-25/+105
| |\
| | * Merge pull request #923 from SamWhited/material-design-iconsDaniel Gultsch2015-01-29145-25/+105
| | |\
| | | * Use Material Design Icons on API 21+Sam Whited2015-01-29145-25/+105
| | |/
| * | 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-262-3/+3
| * 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
| | |/
| * | updated translationsiNPUTmice2015-01-254-432/+476
| * | set jingle file transfer to offer after iq offer has returnediNPUTmice2015-01-251-6/+17
| * | Merge pull request #932 from svetlemodry/developmentDaniel Gultsch2015-01-251-0/+1
| |\ \
| | * | Czech translationJaroslav Lichtblau2015-01-251-0/+1
| |/ /
| * | Merge pull request #931 from betheg/gradle_pluginDaniel Gultsch2015-01-251-1/+1
| |\ \ | | |/ | |/|
| | * update android gradle plugin to 1.0.1Michael2015-01-251-1/+1
| |/
| * Merge pull request #927 from betheg/otr_query_messageDaniel Gultsch2015-01-251-1/+1
| |\
| | * 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
| * | 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
| * Merge pull request #908 from betheg/otr4jDaniel Gultsch2015-01-214-3/+9
| |\
| | * 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 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 updatedJaroslav Lichtblau2015-01-191-406/+420
| |/
| * Merge pull request #904 from SamWhited/remove-sslDaniel Gultsch2015-01-1912-30/+12
| |\
| | * Remove legacy SSL supportSam Whited2015-01-1912-30/+12
| |/