aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* improvements for merge conditionsiNPUTmice2014-08-312-3/+9
|
* add missing blank before nickiNPUTmice2014-08-311-0/+3
|
* Smarter nickname highlight insert in conferncesBahtiar `kalkin-` Gadimov2014-08-311-6/+3
|
* some code cleanupiNPUTmice2014-08-3175-1263/+1482
|
* Merge pull request #391 from betheg/fix_typoDaniel Gultsch2014-08-311-4/+4
|\ | | | | fix forgotten spelling.
| * Merge remote-tracking branch 'upstream/development' into fix_typoMichael2014-08-307-164/+354
| |\
| * \ Merge remote-tracking branch 'upstream/development' into fix_typoMichael2014-08-293-3/+11
| |\ \
| * | | fix forgotten spelling.Michael2014-08-281-4/+4
| | | |
* | | | require encrypted to be the same for messages to get mergediNPUTmice2014-08-311-1/+3
| | | |
* | | | experimental message mergingiNPUTmice2014-08-312-44/+107
| |_|/ |/| |
* | | Merge branch 'sm' into developmentiNPUTmice2014-08-303-146/+250
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java
| * | | reset unsend messages to waitingiNPUTmice2014-08-302-2/+17
| | | |
| * | | properly set stanza count on session resumeiNPUTmice2014-08-301-3/+21
| | | |
| * | | basic message ackingiNPUTmice2014-08-303-131/+200
| | | |
* | | | proper namespaces for xep-0352iNPUTmice2014-08-303-3/+3
| | | |
* | | | send inactive or active on every connect and resumeiNPUTmice2014-08-301-3/+10
| | | |
* | | | added basic csiiNPUTmice2014-08-304-0/+86
|/ / /
* | | version bump to 0.6 with changelogs0.6iNPUTmice2014-08-301-28/+17
| | |
* | | brought npe catcher back for kxml parseriNPUTmice2014-08-301-0/+4
| |/ |/|
* | fixed link to old resourceiNPUTmice2014-08-291-2/+2
| |
* | fixed npeiNPUTmice2014-08-291-0/+4
| |
* | fixed #389iNPUTmice2014-08-291-1/+5
|/
* fixed spelling thanks @bethegiNPUTmice2014-08-286-24/+24
|
* translated missing string in settingsiNPUTmice2014-08-271-2/+6
|
* fixing duplicate private muc messagesiNPUTmice2014-08-251-3/+10
|
* fixed message hintiNPUTmice2014-08-251-51/+61
|
* fixed faulty db creation on first installiNPUTmice2014-08-241-9/+12
|
* use otr encrypiton instead of plain when contact has exactly one online ↵Daniel Gultsch2014-08-241-0/+10
| | | | presence and an otr fingerprint
* jump right into edit account if now accounts are configuredDaniel Gultsch2014-08-232-9/+18
|
* changed workflow on inital avatar publicationDaniel Gultsch2014-08-232-11/+39
|
* experimental muc message deduplicationDaniel Gultsch2014-08-233-2/+25
|
* removed server compat value in favor of a (small xep list)Daniel Gultsch2014-08-232-41/+23
|
* fixed another npeiNPUTmice2014-08-221-7/+10
|
* tiny redesign for private muc messagesiNPUTmice2014-08-222-21/+29
|
* make avatars persisent / available even without internetiNPUTmice2014-08-216-19/+65
|
* save newly taken photos in DCIM diriNPUTmice2014-08-213-33/+42
|
* added roster versioning to calculation of server compatiNPUTmice2014-08-211-0/+5
|
* check if service is bound before adding conferences or contactsiNPUTmice2014-08-211-25/+30
|
* avoid race condition for otr key in jingleiNPUTmice2014-08-211-1/+1
|
* deregister listener in editaccountiNPUTmice2014-08-211-0/+8
|
* revised manage account activity. removed contexual action modeiNPUTmice2014-08-202-172/+109
|
* fixed lint erroriNPUTmice2014-08-191-1/+0
|
* better error display and additional infos (stats) for the edit account activityiNPUTmice2014-08-198-211/+240
|
* more error handling for avatar publicationiNPUTmice2014-08-162-1/+17
|
* some improvements for the edit account activityiNPUTmice2014-08-163-31/+25
|
* moved add/edit account from dialog into seperate activityiNPUTmice2014-08-1510-244/+400
|
* better handling of null streamsiNPUTmice2014-08-153-14/+22
|
* refactored Conversations Adapter into seperate classiNPUTmice2014-08-152-93/+114
|
* fixed #356iNPUTmice2014-08-151-10/+12
|
* fixed muc pm avatariNPUTmice2014-08-141-2/+5
|