Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed #66 | Daniel Gultsch | 2014-05-17 | 2 | -4/+1 |
* | spelling | Daniel Gultsch | 2014-05-17 | 1 | -1/+1 |
* | fixed #108 | Daniel Gultsch | 2014-05-17 | 1 | -3/+4 |
* | added translators to readme | Daniel Gultsch | 2014-05-17 | 1 | -3/+6 |
* | version bump to 0.2.2 | Daniel Gultsch | 2014-05-17 | 1 | -2/+2 |
* | permanent notification disapears now when account is being deleted + code cle... | Daniel Gultsch | 2014-05-17 | 3 | -16/+9 |
* | fixed #113 | Daniel Gultsch | 2014-05-17 | 1 | -2/+1 |
* | Merge pull request #120 from kruks23/development | Daniel Gultsch | 2014-05-16 | 2 | -1/+33 |
|\ | |||||
| * | Update Spanish Translations + harcoded pref_advanced_settings | kruks23 | 2014-05-16 | 2 | -1/+33 |
* | | reworked message to conferences | Daniel Gultsch | 2014-05-16 | 2 | -16/+19 |
* | | fixed npe for otr sessions with non contacts | Daniel Gultsch | 2014-05-16 | 1 | -4/+8 |
|/ | |||||
* | updated german translation | Daniel Gultsch | 2014-05-16 | 2 | -34/+71 |
* | offline sending of pgp fixed | Daniel Gultsch | 2014-05-16 | 2 | -25/+43 |
* | formating | Daniel Gultsch | 2014-05-16 | 2 | -2/+2 |
* | fixed null in shared link | Daniel Gultsch | 2014-05-16 | 1 | -1/+5 |
* | Merge pull request #117 from BenoitBouvarel/development | Daniel Gultsch | 2014-05-16 | 8 | -37/+144 |
|\ | |||||
| * | French translation + hard-coded string > @string | Benoit Bouvarel | 2014-05-16 | 8 | -37/+144 |
|/ | |||||
* | Merge pull request #109 from kruks23/development | Daniel Gultsch | 2014-05-15 | 1 | -3/+14 |
|\ | |||||
| * | Update Spanish Translations | kruks23 | 2014-05-14 | 1 | -3/+14 |
* | | fixed npe | Daniel Gultsch | 2014-05-15 | 1 | -5/+3 |
* | | hiding the prepare image toast after error or success | Daniel Gultsch | 2014-05-14 | 2 | -3/+15 |
* | | fixed possible npe | Daniel Gultsch | 2014-05-14 | 1 | -4/+3 |
* | | fixed #105 | Daniel Gultsch | 2014-05-14 | 3 | -29/+43 |
|/ | |||||
* | made message parser non static | Daniel Gultsch | 2014-05-14 | 2 | -64/+86 |
* | code clean up | Daniel Gultsch | 2014-05-14 | 1 | -104/+51 |
* | Merge branch 'development' into feature/take_picture | Daniel Gultsch | 2014-05-14 | 4 | -3/+8 |
|\ | |||||
| * | one more entry to strings file | Daniel Gultsch | 2014-05-13 | 2 | -1/+2 |
| * | version bump | Daniel Gultsch | 2014-05-13 | 2 | -2/+6 |
* | | added presence selection | Daniel Gultsch | 2014-05-13 | 1 | -5/+19 |
* | | Merge branch 'development' into feature/take_picture | Daniel Gultsch | 2014-05-13 | 1 | -71/+116 |
|\| | |||||
| * | Merge branch 'beriain-development' into development | Daniel Gultsch | 2014-05-13 | 1 | -71/+116 |
| |\ | |||||
| | * | Merge branch 'development' of https://github.com/beriain/Conversations into b... | Daniel Gultsch | 2014-05-13 | 1 | -71/+116 |
| |/| | |||||
| | * | Fix | Beriain | 2014-05-13 | 1 | -79/+79 |
| | * | Merge https://github.com/siacs/Conversations into development | Beriain | 2014-05-13 | 14 | -44/+416 |
| | |\ | |||||
| | * | | Update basque translation and include preferences | Beriain | 2014-05-13 | 1 | -0/+8 |
| | * | | Update basque translation | Beriain | 2014-05-12 | 1 | -0/+34 |
| | * | | Merge https://github.com/siacs/Conversations into development | Beriain | 2014-05-12 | 21 | -265/+439 |
| | |\ \ | |||||
| | * | | | Update basque translation | Beriain | 2014-05-08 | 1 | -0/+3 |
* | | | | | Merge branch 'development' into feature/take_picture | Daniel Gultsch | 2014-05-13 | 1 | -10/+12 |
|\| | | | | |||||
| * | | | | code cleanup | Daniel Gultsch | 2014-05-13 | 1 | -10/+12 |
* | | | | | takeing pictures over intent | Daniel Gultsch | 2014-05-13 | 3 | -42/+95 |
* | | | | | Merge branch 'development' into feature/take_picture | Daniel Gultsch | 2014-05-13 | 2 | -8/+10 |
|\| | | | | |||||
| * | | | | static method for providing content uri | Daniel Gultsch | 2014-05-13 | 2 | -8/+10 |
| | |_|/ | |/| | | |||||
* / | | | submenu for attach file | Daniel Gultsch | 2014-05-13 | 3 | -1/+42 |
|/ / / | |||||
* | | | ensure that iq response is being send out for jingle packets. remove jingle c... | Daniel Gultsch | 2014-05-13 | 2 | -22/+44 |
* | | | german translation | Daniel Gultsch | 2014-05-13 | 1 | -1/+1 |
* | | | further translations | Daniel Gultsch | 2014-05-13 | 5 | -17/+67 |
* | | | fixed npe in tag writer | Daniel Gultsch | 2014-05-13 | 1 | -2/+6 |
* | | | fixed french language | Daniel Gultsch | 2014-05-13 | 1 | -13/+13 |
* | | | Merge pull request #88 from BenoitBouvarel/development | Daniel Gultsch | 2014-05-12 | 3 | -0/+127 |
|\ \ \ |