aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * get rid of some useless debuggingiNPUTmice2015-02-231-3/+0
| * init mode (first start) for StartConversationActivity (no up button) and avoi...iNPUTmice2015-02-224-14/+44
| * look at 5 muc users instead of 4 for tile cache clearingiNPUTmice2015-02-221-2/+2
| * properly remove invalid avatariNPUTmice2015-02-222-0/+2
| * clear muc tiles cache only when necessaryiNPUTmice2015-02-212-1/+22
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-2114-53/+267
| * fixed #993iNPUTmice2015-02-191-1/+2
| * launch edit account activity when starting Conversations for the first time (...iNPUTmice2015-02-191-5/+9
| * made xmpp uris case insensitiveiNPUTmice2015-02-181-3/+3
| * always call to cancel before loading new avatarsiNPUTmice2015-02-182-24/+28
| * always go through reconnect method instead of just starting XmppConnection th...iNPUTmice2015-02-181-4/+1
| * avoid weird npe. fixed #991iNPUTmice2015-02-181-1/+3
| * limit ui refresh rateiNPUTmice2015-02-178-93/+81
| * 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> firstStephen Paul Weber2015-02-151-1/+1
| * | 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
| |\
| | * 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
| |/
* | - Some comments to refer to the XEPs addedsteckbrief2015-02-211-15/+28
* | Merge master-originsteckbrief2015-02-20236-5711/+8203
|\|
| * don't disable any ciphersiNPUTmice2015-02-021-3/+4
| * Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2015-02-025-0/+0
| |\
| | * 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 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