| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #376 from wapolinar/development | Daniel Gultsch | 2014-08-25 | 1 | -1/+1 |
| |\ | | | | | Update strings.xml | ||||
| | * | Update strings.xml | wapolinar | 2014-08-25 | 1 | -1/+1 |
| | | | | | | | Typo in a key for the German translation. | ||||
| * | | Merge pull request #377 from kruks23/translation2 | Daniel Gultsch | 2014-08-25 | 1 | -11/+6 |
| |\ \ | | | | | | | Update Spanish Translations | ||||
| | * | | Update Spanish Translations | kruks23 | 2014-08-25 | 1 | -11/+6 |
| |/ / | |||||
| * / | fixing duplicate private muc messages | iNPUTmice | 2014-08-25 | 1 | -3/+10 |
| |/ | |||||
| * | fixed message hint | iNPUTmice | 2014-08-25 | 1 | -51/+61 |
| | | |||||
| * | fixed faulty db creation on first install | iNPUTmice | 2014-08-24 | 1 | -9/+12 |
| | | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2014-08-24 | 1 | -11/+12 |
| |\ | |||||
| | * | Merge pull request #375 from kriztan/patch-2 | Daniel Gultsch | 2014-08-24 | 1 | -11/+12 |
| | |\ | | | | | | | Update german translations | ||||
| | | * | Update strings.xml | kriztan | 2014-08-24 | 1 | -11/+12 |
| | |/ | |||||
| * | | use otr encrypiton instead of plain when contact has exactly one online ↵ | Daniel Gultsch | 2014-08-24 | 1 | -0/+10 |
| | | | | | | | | | presence and an otr fingerprint | ||||
| * | | jump right into edit account if now accounts are configured | Daniel Gultsch | 2014-08-23 | 3 | -10/+19 |
| | | | |||||
| * | | changed workflow on inital avatar publication | Daniel Gultsch | 2014-08-23 | 3 | -11/+40 |
| |/ | |||||
| * | experimental muc message deduplication | Daniel Gultsch | 2014-08-23 | 3 | -2/+25 |
| | | |||||
| * | removed server compat value in favor of a (small xep list) | Daniel Gultsch | 2014-08-23 | 4 | -177/+187 |
| | | |||||
| * | Merge pull request #373 from kruks23/translation1 | Daniel Gultsch | 2014-08-23 | 1 | -3/+10 |
| |\ | | | | | Update Spanish Translations | ||||
| | * | Update Spanish Translations | kruks23 | 2014-08-21 | 1 | -3/+10 |
| | | | |||||
| * | | fixed another npe | iNPUTmice | 2014-08-22 | 1 | -7/+10 |
| | | | |||||
| * | | tiny redesign for private muc messages | iNPUTmice | 2014-08-22 | 3 | -23/+31 |
| |/ | |||||
| * | make avatars persisent / available even without internet | iNPUTmice | 2014-08-21 | 6 | -19/+65 |
| | | |||||
| * | save newly taken photos in DCIM dir | iNPUTmice | 2014-08-21 | 3 | -33/+42 |
| | | |||||
| * | added roster versioning to calculation of server compat | iNPUTmice | 2014-08-21 | 1 | -0/+5 |
| | | |||||
| * | added PEP to readme | iNPUTmice | 2014-08-21 | 1 | -0/+1 |
| | | |||||
| * | check if service is bound before adding conferences or contacts | iNPUTmice | 2014-08-21 | 1 | -25/+30 |
| | | |||||
| * | avoid race condition for otr key in jingle | iNPUTmice | 2014-08-21 | 1 | -1/+1 |
| | | |||||
| * | deregister listener in editaccount | iNPUTmice | 2014-08-21 | 1 | -0/+8 |
| | | |||||
| * | added missing string resource again | iNPUTmice | 2014-08-20 | 1 | -0/+2 |
| | | |||||
| * | revised manage account activity. removed contexual action mode | iNPUTmice | 2014-08-20 | 6 | -237/+159 |
| | | |||||
| * | fixed lint error | iNPUTmice | 2014-08-19 | 1 | -1/+0 |
| | | |||||
| * | better error display and additional infos (stats) for the edit account activity | iNPUTmice | 2014-08-19 | 11 | -377/+314 |
| | | |||||
| * | Merge pull request #365 from beriain/development | Daniel Gultsch | 2014-08-19 | 1 | -3/+19 |
| |\ | | | | | Update strings.xml | ||||
| | * | Update strings.xml | Aitor Beriain | 2014-08-18 | 1 | -3/+19 |
| | | | |||||
| * | | Merge pull request #363 from kriztan/patch-1 | Daniel Gultsch | 2014-08-19 | 1 | -0/+1 |
| |\ \ | | | | | | | Update german translations | ||||
| | * | | Update strings.xml | kriztan | 2014-08-17 | 1 | -0/+1 |
| |/ / | |||||
| * | | more error handling for avatar publication | iNPUTmice | 2014-08-16 | 2 | -1/+17 |
| | | | |||||
| * | | some improvements for the edit account activity | iNPUTmice | 2014-08-16 | 3 | -31/+25 |
| | | | |||||
| * | | moved add/edit account from dialog into seperate activity | iNPUTmice | 2014-08-15 | 13 | -255/+521 |
| | | | |||||
| * | | better handling of null streams | iNPUTmice | 2014-08-15 | 3 | -14/+22 |
| | | | |||||
| * | | refactored Conversations Adapter into seperate class | iNPUTmice | 2014-08-15 | 2 | -93/+114 |
| | | | |||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-08-15 | 1 | -18/+29 |
| |\ \ | |||||
| | * \ | Merge pull request #355 from kriztan/patch-2 | Daniel Gultsch | 2014-08-15 | 1 | -18/+29 |
| | |\ \ | | | | | | | | | Updated german translation | ||||
| | | * | | Update strings.xml | kriztan | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | corrected missspelling | ||||
| | | * | | Update strings.xml | kriztan | 2014-08-15 | 1 | -17/+28 |
| | |/ / | | | | | | | Added German Translations and corrected misspellings. | ||||
| * | | | fixed #356 | iNPUTmice | 2014-08-15 | 1 | -10/+12 |
| | | | | |||||
| * | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-08-14 | 5 | -2/+316 |
| |\| | | |||||
| | * | | Merge pull request #354 from GreenLunar/development | Daniel Gultsch | 2014-08-14 | 2 | -0/+306 |
| | |\ \ | | | | | | | | | Add Hebrew translation. | ||||
| | | * | | Add Hebrew translation. | GreenLunar | 2014-08-14 | 1 | -0/+284 |
| | | | | | |||||
| | | * | | Add Hebrew translation. | GreenLunar | 2014-08-14 | 1 | -0/+22 |
| | |/ / | |||||
| | * | | Merge pull request #349 from kruks23/development | Daniel Gultsch | 2014-08-14 | 3 | -2/+10 |
| | |\ \ | | | | | | | | | Update Spanish Translations + publish_avatar button and menu conflict | ||||
| | | * | | Update Spanish Translations + publish_avatar button and menu conflict | kruks23 | 2014-08-12 | 3 | -2/+10 |
| | | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |