| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into development | iNPUTmice | 2014-07-31 | 2 | -2/+5 | |
| |\ \ | | | | | | | | | | | | | Conflicts: AndroidManifest.xml | |||||
| | * | | version bump to 0.5.2 | iNPUTmice | 2014-07-31 | 2 | -3/+6 | |
| | | | | ||||||
| | * | | fixed npe in start conversation activity | iNPUTmice | 2014-07-31 | 1 | -1/+3 | |
| | | | | ||||||
| | * | | fixed generation of muc pictures with copyonwrite user list | iNPUTmice | 2014-07-31 | 1 | -6/+10 | |
| | | | | ||||||
| | * | | fixed rare npe in loading of selfi | iNPUTmice | 2014-07-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fixed npe for the rare case that user has disabled his action bar | iNPUTmice | 2014-07-31 | 1 | -7/+14 | |
| | | | | ||||||
| * | | | added 'how to logcat' to readme | iNPUTmice | 2014-07-30 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | fixed npe for the rare case that user has disabled his action bar | iNPUTmice | 2014-07-30 | 1 | -7/+14 | |
| | | | | ||||||
| * | | | fixed npe in start conversation activity | iNPUTmice | 2014-07-30 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | fixed generation of muc pictures with copyonwrite user list | iNPUTmice | 2014-07-30 | 1 | -6/+10 | |
| | | | | ||||||
| * | | | fixed rare npe in loading of selfi | iNPUTmice | 2014-07-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | fixed #239 - show contact names and pictures in muc if real jid is known | iNPUTmice | 2014-07-29 | 6 | -133/+230 | |
| | | | | ||||||
| * | | | started development for 0.6 | iNPUTmice | 2014-07-28 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | added changelog | iNPUTmice | 2014-07-28 | 1 | -0/+4 | |
| | | | ||||||
| * | | bumped to version 0.5.1 | iNPUTmice | 2014-07-28 | 1 | -2/+2 | |
| | | | ||||||
| * | | added more features to readme | iNPUTmice | 2014-07-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | line break for readme | iNPUTmice | 2014-07-27 | 1 | -0/+1 | |
| | | | ||||||
| * | | fixed bug in message parser | iNPUTmice | 2014-07-27 | 1 | -4/+8 | |
| | | | ||||||
| * | | updated readme a bit | iNPUTmice | 2014-07-27 | 1 | -6/+5 | |
| | | | ||||||
| * | | trying to work around npe in androids xml parser | iNPUTmice | 2014-07-27 | 1 | -3/+1 | |
| | | | ||||||
| * | | fixe race conditons with newIntent | iNPUTmice | 2014-07-27 | 1 | -19/+17 | |
| | | | ||||||
| * | | migrated some ArrayLists to CopyOnWriteArrayLists | iNPUTmice | 2014-07-27 | 6 | -22/+14 | |
| | | | ||||||
| * | | fixed npe with unsuccesfull bind | iNPUTmice | 2014-07-26 | 1 | -18/+25 | |
| | | | ||||||
| * | | fixed npe when user was very quick with starting to type in ↵ | iNPUTmice | 2014-07-26 | 1 | -2/+4 | |
| | | | | | | | | | startConversationactivity | |||||
| * | | added swedish translation by @andersruneson | iNPUTmice | 2014-07-26 | 3 | -0/+294 | |
| | | | ||||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-26 | 1 | -2/+32 | |
| |\ \ | ||||||
| | * \ | Merge pull request #315 from jelmer/dutch | Daniel Gultsch | 2014-07-26 | 1 | -2/+32 | |
| | |\ \ | | | | | | | | | Update Dutch translations. | |||||
| | | * | | Update Dutch translations. | Jelmer Vernooij | 2014-07-26 | 1 | -2/+32 | |
| | |/ / | ||||||
| * | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-25 | 2 | -60/+90 | |
| |\| | | ||||||
| | * | | Merge pull request #313 from suraia/translation-de | Daniel Gultsch | 2014-07-25 | 2 | -60/+90 | |
| | |\ \ | | | | | | | | | Update German translation | |||||
| | | * | | Update German translation. | Michael Kuhn | 2014-07-24 | 2 | -60/+90 | |
| | |/ / | ||||||
| * / / | version bump to 0.5 | iNPUTmice | 2014-07-24 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #312 from beriain/development | Daniel Gultsch | 2014-07-24 | 1 | -2/+2 | |
| |\| | | | | | Some corrections | |||||
| | * | Some corrections | Aitor Beriain | 2014-07-24 | 1 | -2/+2 | |
| |/ | ||||||
| * | updated screenshots | iNPUTmice | 2014-07-24 | 1 | -0/+0 | |
| | | ||||||
| * | removed duplicates from muc suggestions | iNPUTmice | 2014-07-24 | 2 | -6/+7 | |
| | | ||||||
| * | included version string in crash reports | iNPUTmice | 2014-07-24 | 1 | -6/+17 | |
| | | ||||||
| * | french translations by @BenoitBouvarel fixed #311 | iNPUTmice | 2014-07-24 | 1 | -7/+20 | |
| | | ||||||
| * | fixed spanish string. wild guessed + google translate fix for basque | iNPUTmice | 2014-07-24 | 2 | -2/+2 | |
| | | ||||||
| * | added some translations back that have been removed be accident | iNPUTmice | 2014-07-24 | 7 | -7/+21 | |
| | | ||||||
| * | Merge branch 'rostovtsev-development' into development | iNPUTmice | 2014-07-24 | 1 | -0/+12 | |
| |\ | ||||||
| | * | Merge branch 'development' of https://github.com/rostovtsev/Conversations ↵ | iNPUTmice | 2014-07-24 | 1 | -0/+12 | |
| |/| | | | | | | | | | | | | | into rostovtsev-development Conflicts: res/values-ru/strings.xml | |||||
| | * | Update strings.xml | Ilia | 2014-07-24 | 1 | -2/+2 | |
| | | | ||||||
| | * | Added translations | Ilia | 2014-07-24 | 1 | -0/+14 | |
| | | | | | | | Added translations per issue #309 - Missing Translations | |||||
| * | | added jelmer to the list of translators | iNPUTmice | 2014-07-24 | 1 | -0/+1 | |
| | | | ||||||
| * | | removed more legacy tls error handling stuff | iNPUTmice | 2014-07-24 | 3 | -9/+0 | |
| | | | ||||||
| * | | removed outdated tls error | iNPUTmice | 2014-07-24 | 3 | -11/+2 | |
| | | | ||||||
| * | | removed outdated translations from languge files | iNPUTmice | 2014-07-24 | 8 | -108/+2 | |
| | | | ||||||
| * | | presonalized read up to this point message | iNPUTmice | 2014-07-24 | 2 | -11/+8 | |
| | | | ||||||
| * | | answer correctly if both markers and receipts are requested | iNPUTmice | 2014-07-24 | 2 | -13/+17 | |
| | | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |