aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-172-9/+19
* Merge pull request #681 from SamWhited/searchlocalefixDaniel Gultsch2014-11-172-6/+14
|\
| * Use `Locale.US' for string comparisons in searchSam Whited2014-11-172-6/+14
* | Merge pull request #680 from ferdev1/patch-2Daniel Gultsch2014-11-171-2/+2
|\ \ | |/ |/|
| * Update strings.xmlferdev12014-11-171-2/+2
* | trim search before searchingiNPUTmice2014-11-171-2/+2
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-171-2/+3
|\|
| * Fix linter suppressionSam Whited2014-11-171-2/+3
* | split search keywords by whitespaces and imply AND operatioriNPUTmice2014-11-171-1/+11
* | slightly modified logo / launcher iconiNPUTmice2014-11-178-0/+0
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-171-1/+1
|\
| * Merge pull request #675 from ferdev1/patch-1Daniel Gultsch2014-11-171-1/+1
| |\
| | * Fix stringferdev12014-11-161-1/+1
* | | highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-174-73/+106
|/ /
* | made tags searchableiNPUTmice2014-11-162-157/+180
* | fixed regression of xmpp uris not workingiNPUTmice2014-11-162-14/+11
|/
* Merge pull request #673 from SamWhited/developmentDaniel Gultsch2014-11-161-1/+1
|\
| * Fix fetching accounts by JIDsSam Whited2014-11-161-1/+1
* | happy hanukkahiNPUTmice2014-11-1613-24/+162
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-162-3/+3
|\
| * Don't escape passwords in SASLSam Whited2014-11-152-3/+3
* | show full time stamp in connection established fieldiNPUTmice2014-11-161-1/+1
* | better error checking in ssl switch overiNPUTmice2014-11-161-5/+9
|/
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-166-58/+214
* Merge branch 'master' into developmentiNPUTmice2014-11-161-5/+18
|\
| * close cursor for databaseiNPUTmice2014-11-161-5/+18
| * made presences synchronizediNPUTmice2014-11-131-13/+27
| * more npe checks in muc packet parseriNPUTmice2014-11-131-32/+35
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-1611-69/+119
* | Merge pull request #669 from SamWhited/scramcachingDaniel Gultsch2014-11-152-10/+51
|\ \
| * | Cache SCRAM-SHA-1 keys for current sessionSam Whited2014-11-152-10/+51
* | | Merge pull request #670 from kruks23/translation9Daniel Gultsch2014-11-151-3/+38
|\ \ \
| * | | Update Spanish Translationskruks232014-11-151-3/+38
| |/ /
* / / small modifications for changing an account status in XmppConnectioniNPUTmice2014-11-151-8/+6
|/ /
* | Merge pull request #668 from SamWhited/auth-pinningDaniel Gultsch2014-11-1518-280/+295
|\ \
| * | Set security error status on TLS cert mismatchSam Whited2014-11-151-6/+7
| * | Remove extra status wrapper methodSam Whited2014-11-152-6/+1
| * | Add incompatible server statusSam Whited2014-11-154-66/+19
| * | Add security error statusSam Whited2014-11-154-13/+22
| * | Make account status an enumSam Whited2014-11-1513-200/+215
| * | Add auth method pinningSam Whited2014-11-156-16/+58
* | | fixed some disco / carbon related bugsiNPUTmice2014-11-151-29/+43
|/ /
* | Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-1523-275/+772
|\ \
| * | handled more error casesiNPUTmice2014-11-153-5/+30
| * | better cleanup after unsuccesful transfersiNPUTmice2014-11-153-1/+35
| * | fixed description in notifications and conversation overviewiNPUTmice2014-11-158-50/+93
| * | fixed resending for files as welliNPUTmice2014-11-152-3/+4
| * | made file transfers cancelableiNPUTmice2014-11-158-22/+76
| * | adepted conversationadapter to deal with filesiNPUTmice2014-11-152-3/+23
| * | progress for ibb transfersiNPUTmice2014-11-155-13/+27
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:37:27 +0000