aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* moved roster loading to async task as welliNPUTmice2015-02-171-10/+22
|
* refresh list view more ofteniNPUTmice2015-02-172-2/+2
|
* pulled translations from transifexiNPUTmice2015-02-1610-28/+647
|
* support for XEP-0092: Software VersioniNPUTmice2015-02-165-20/+51
|
* fixed avatar cache lookup in ListItemAdapteriNPUTmice2015-02-161-4/+1
|
* Merge pull request #986 from singpolyma/vitelity-s.ms-compatabilityDaniel Gultsch2015-02-151-1/+1
|\ | | | | Vitelity's s.ms service requires <body> first
| * Vitelity's s.ms service requires <body> firstStephen Paul Weber2015-02-151-1/+1
| | | | | | | | | | | | | | If the <body> tag is not first, their bot just silently drops the stanza. I know we shouldn't have to care about order, and I'm trying to get them to fix it, but it's not high-priority for them since "most" clients seem to work, so I'd like this workaround in.
* | made image view background more colorful while waiting on actual avatar to loadiNPUTmice2015-02-152-2/+3
|/
* loading avatars in seperate tasksiNPUTmice2015-02-153-18/+203
|
* load messages asynchronouslyiNPUTmice2015-02-122-2/+24
|
* use time instead of uptime for unmuteiNPUTmice2015-02-122-5/+2
|
* added actions to error notificationiNPUTmice2015-02-1014-1/+53
|
* strip fractional seconds from timestamp before parsingiNPUTmice2015-02-102-6/+4
|
* disabled cipher loggingiNPUTmice2015-02-091-1/+1
|
* Merge pull request #959 from SamWhited/ciphers_fixDaniel Gultsch2015-02-094-9/+12
|\ | | | | Ciphers fix
| * Use platform ciphers as well, just prefer oursSam Whited2015-02-024-9/+12
| |
* | don't show 'enter pgp key' in non encrypted chatsiNPUTmice2015-02-091-0/+1
| |
* | always add a non resolved SRV record to the listiNPUTmice2015-02-091-6/+1
| |
* | made delay timestamp parser accept nano secondsiNPUTmice2015-02-091-1/+1
| |
* | sort users in mucDaniel Gultsch2015-02-071-3/+12
| |
* | trim message bodys on displayDaniel Gultsch2015-02-072-3/+3
| |
* | refactored how snackbar is displayedDaniel Gultsch2015-02-071-82/+105
|/
* don't disable any ciphersiNPUTmice2015-02-021-3/+4
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-02-025-0/+0
|\ | | | | | | development
| * Remove another unused resourceSam Whited2015-02-015-0/+0
| |
* | added more ciphers for old openssl versionsiNPUTmice2015-02-021-1/+3
|/
* Merge pull request #955 from SamWhited/unused_resourcesDaniel Gultsch2015-02-0124-0/+0
|\ | | | | Remove unused resources
| * Remove unused resourcesSam Whited2015-02-0124-0/+0
| |
* | pulled spanish translations againiNPUTmice2015-02-011-2/+2
|/
* pulled translations from transifexiNPUTmice2015-02-0116-0/+1513
|
* Removes some unused strings (the legacy SSL stuff)Sam Whited2015-02-014-7/+0
|
* fixed text preview for imagesiNPUTmice2015-02-011-1/+1
|
* Remove title_activity_conversations and use app_name insteadkruks232015-01-3014-15/+2
|
* made version codes ready for release candidate in beta channeliNPUTmice2015-01-291-1/+1
|
* don't count when attempt failed completlyiNPUTmice2015-01-291-0/+1
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-01-29144-25/+104
|\ | | | | | | development
| * Use Material Design Icons on API 21+Sam Whited2015-01-29144-25/+104
| |
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-01-291-10/+10
|\| | | | | | | development
| * Merge pull request #941 from SamWhited/snackbar_orderingDaniel Gultsch2015-01-281-10/+10
| |\ | | | | | | Show errors before mute snackbar
| | * Show errors before mute snackbarSam Whited2015-01-271-10/+10
| | | | | | | | | | | | See #939
* | | 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.
| * otr: switch to the otr-state the partner alternate.Michael2015-01-252-0/+3
| | | | | | | | should also fixed #877
* | Merge pull request #933 from betheg/mergeableDaniel Gultsch2015-01-253-5/+9
|\ \ | | | | | | fix mergable() for /me command.