| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 1) Renamed values-zh values-zh_rCN in accordance with #329 and Android ↵ | Isaac Kwan | 2014-10-03 | 4 | -0/+343 |
| | | | | | | | | conventions 2) Added arrays.xml translations for Simplified Chinese (zh_rCN) 3) Added translations (arrays.xml and strings.xml) for Traditional Chinese (zh_rTW) | ||||
| * | calculate sample size for thumbnails as well | iNPUTmice | 2014-09-30 | 1 | -2/+15 |
| | | |||||
| * | Merge pull request #505 from betheg/fix_invite | Daniel Gultsch | 2014-09-30 | 1 | -1/+3 |
| |\ | | | | | fixed muc invite with <body/>. | ||||
| | * | fixed muc invite with <body/>. | Michael | 2014-09-29 | 1 | -1/+3 |
| | | | |||||
| * | | notifiy only when necessary | Daniel Gultsch | 2014-09-29 | 7 | -44/+68 |
| | | | |||||
| * | | more improvments for new notification service | Daniel Gultsch | 2014-09-28 | 8 | -211/+53 |
| | | | |||||
| * | | new notification service. first draft | Daniel Gultsch | 2014-09-28 | 22 | -84/+264 |
| |/ | |||||
| * | made muc passwords and prefereced encryption method persistant across restarts | iNPUTmice | 2014-09-27 | 8 | -12/+75 |
| | | |||||
| * | Merge pull request #504 from betheg/inflate | Daniel Gultsch | 2014-09-27 | 1 | -2/+2 |
| |\ | | | | | add false argument to inflate. | ||||
| | * | add false argument to inflate. | Michael | 2014-09-27 | 1 | -2/+2 |
| | | | |||||
| * | | fixed link | iNPUTmice | 2014-09-27 | 1 | -1/+1 |
| | | | |||||
| * | | added flattr button | iNPUTmice | 2014-09-27 | 1 | -1/+4 |
| |/ | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-27 | 6 | -1/+17 |
| |\ | |||||
| | * | Merge pull request #485 from kruks23/translation5 | Daniel Gultsch | 2014-09-27 | 1 | -0/+7 |
| | |\ | | | | | | | Update Spanish Translations | ||||
| | | * | Update Spanish Translations | kruks23 | 2014-09-24 | 1 | -0/+7 |
| | | | | |||||
| | * | | Merge pull request #487 from weiss/add-german-translations | Daniel Gultsch | 2014-09-27 | 2 | -0/+9 |
| | |\ \ | | | | | | | | | Add missing German translations | ||||
| | | * | | Add missing German translations | Holger Weiß | 2014-09-24 | 2 | -0/+9 |
| | | | | | |||||
| | * | | | Merge pull request #498 from betheg/locale_folder | Daniel Gultsch | 2014-09-27 | 2 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | fix lint-warning: Wrong locale name | ||||
| | | * | | | fix lint-warning: Wrong locale name | Michael | 2014-09-26 | 2 | -0/+0 |
| | | |/ / | | | | | | | | | | | | | The Hebrew ("he") language code is rewritten as "iw" | ||||
| | * | | | Merge pull request #499 from betheg/hardcoded_string | Daniel Gultsch | 2014-09-27 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | fix lint-warning: Hardcoded text | ||||
| | | * | | | fix lint-warning: Hardcoded text | Michael | 2014-09-26 | 1 | -1/+1 |
| | | |/ / | |||||
| * | / / | fixed some lint warnings. thanks @betheg | iNPUTmice | 2014-09-27 | 5 | -1/+10 |
| |/ / / | |||||
| * | | | anwser to xmpp: style uris. fixed open conversations from android address book | iNPUTmice | 2014-09-27 | 5 | -20/+107 |
| | | | | |||||
| * | | | revised send button in landscape mode | iNPUTmice | 2014-09-27 | 2 | -2/+3 |
| |/ / | |||||
| * / | added Aizaz AZ as translator to readme | iNPUTmice | 2014-09-24 | 1 | -0/+1 |
| |/ | |||||
| * | version bump to 0.7.20.7.2 | iNPUTmice | 2014-09-23 | 2 | -2/+13 |
| | | |||||
| * | changed method that determins whether or not sm is available | iNPUTmice | 2014-09-23 | 1 | -5/+1 |
| | | |||||
| * | refactored options menu handling a bit | iNPUTmice | 2014-09-23 | 1 | -140/+149 |
| | | |||||
| * | changed app title in cs translation | iNPUTmice | 2014-09-23 | 1 | -1/+1 |
| | | |||||
| * | dont mark message as send on resend | iNPUTmice | 2014-09-23 | 1 | -1/+6 |
| | | |||||
| * | fixed rare npe | iNPUTmice | 2014-09-23 | 1 | -20/+21 |
| | | |||||
| * | fixed very rare npe | iNPUTmice | 2014-09-22 | 1 | -1/+1 |
| | | |||||
| * | formating fixes for chinese | iNPUTmice | 2014-09-22 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-22 | 1 | -0/+260 |
| |\ | |||||
| | * | Merge pull request #479 from AizazAZ/master | Daniel Gultsch | 2014-09-22 | 1 | -0/+260 |
| | |\ | | | | | | | Added Chinese (Simplified) Translation | ||||
| | | * | Added Chinese (Simplified) Translation | AZ | 2014-09-22 | 1 | -0/+260 |
| | | | | |||||
| * | | | fixed #452 | iNPUTmice | 2014-09-22 | 6 | -4/+30 |
| |/ / | |||||
| * | | don't show time stamp within the last 6 hours of a new day | iNPUTmice | 2014-09-22 | 1 | -1/+1 |
| | | | |||||
| * | | added 'model' to selectable resources. fixed #461 | iNPUTmice | 2014-09-22 | 1 | -1/+15 |
| | | | |||||
| * | | show full date in message list, fixed #328 | iNPUTmice | 2014-09-21 | 2 | -4/+20 |
| | | | |||||
| * | | changed message merger a bit | iNPUTmice | 2014-09-21 | 1 | -9/+10 |
| | | | |||||
| * | | changed some preference descriptions | iNPUTmice | 2014-09-21 | 2 | -5/+5 |
| | | | |||||
| * | | fixed #454 - added fast srcolling to some lists | iNPUTmice | 2014-09-21 | 2 | -0/+2 |
| | | | |||||
| * | | changed security indicator and changed opacity of received tick to match the ↵ | iNPUTmice | 2014-09-20 | 7 | -14/+18 |
| | | | | | | | | | text | ||||
| * | | Merge pull request #460 from betheg/receipts | Daniel Gultsch | 2014-09-20 | 16 | -10/+143 |
| |\ \ | | | | | | | indicates received messages with a tick. | ||||
| | * | | indicates received messages with a tick. | Michael | 2014-09-20 | 16 | -10/+143 |
| | | | | |||||
| * | | | fixed presence splitting | iNPUTmice | 2014-09-20 | 13 | -31/+31 |
| | | | | |||||
| * | | | fixed #470 | iNPUTmice | 2014-09-20 | 4 | -43/+60 |
| |/ / | |||||
| * | | made xmppconnection service available in generators | iNPUTmice | 2014-09-20 | 5 | -4/+27 |
| | | | |||||
| * | | scroll fixes | iNPUTmice | 2014-09-19 | 2 | -10/+11 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |