| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'development' of https://github.com/beriain/Conversations into ↵ | iNPUTmice | 2014-08-28 | 1 | -12/+20 | |
| |\ | | | | | | | | | | | | | development Conflicts: res/values-eu/strings.xml | |||||
| | * | Update strings.xml | Aitor Beriain | 2014-08-27 | 1 | -20/+20 | |
| | | | ||||||
| * | | translated missing string in settings | iNPUTmice | 2014-08-27 | 5 | -44/+39 | |
| | | | ||||||
| * | | added swedish translations by Anders Sandblad @andersruneson | iNPUTmice | 2014-08-27 | 1 | -1/+24 | |
| | | | ||||||
| * | | added missing string to german translation | iNPUTmice | 2014-08-26 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge pull request #385 from rostovtsev/development | Daniel Gultsch | 2014-08-26 | 1 | -23/+59 | |
| |\ \ | | | | | | | russian translation for 0.6 | |||||
| | * | | Updated to 0.6.1 | Ilia | 2014-08-26 | 1 | -23/+59 | |
| |/ / | | | | | | | 1. Different bug fixed. 2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages. | |||||
| * | | Merge pull request #384 from wapolinar/typos | Daniel Gultsch | 2014-08-26 | 1 | -11/+11 | |
| |\ \ | | | | | | | Typos in readme. | |||||
| | * | | Typos in readme. | Wolfgang Apolinarski | 2014-08-26 | 1 | -11/+11 | |
| |/ / | ||||||
| * | | removed deprecated strings from translations | iNPUTmice | 2014-08-26 | 6 | -49/+1 | |
| | | | ||||||
| * | | 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 | |
| |\ \ | ||||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |