Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-14 | 1 | -1/+5 |
|\ | |||||
| * | Update Spanish Translations | kruks23 | 2014-07-13 | 1 | -1/+5 |
| | | |||||
* | | fetch bookmarks from server | iNPUTmice | 2014-07-14 | 3 | -1/+14 |
|/ | |||||
* | fixed #268 | iNPUTmice | 2014-07-12 | 1 | -0/+0 |
| | |||||
* | switch SearchView with custom action view | iNPUTmice | 2014-07-11 | 2 | -1/+20 |
| | |||||
* | added join conference dialog | iNPUTmice | 2014-07-11 | 4 | -5/+56 |
| | |||||
* | cleanup. removed old contacts activity. WARNING: this will temporarly ↵ | iNPUTmice | 2014-07-11 | 3 | -92/+0 |
| | | | | disable muc invites | ||||
* | fixed #255 and made some other improvements to the subscription mgmt | iNPUTmice | 2014-07-11 | 1 | -12/+0 |
| | |||||
* | Merge pull request #262 from kruks23/development | Daniel Gultsch | 2014-07-11 | 1 | -3/+16 |
|\ | | | | | Show time in messages previous days | ||||
| * | Update Spanish Translations | kruks23 | 2014-07-10 | 1 | -3/+16 |
| | | |||||
* | | fixed #38 | iNPUTmice | 2014-07-10 | 2 | -6/+4 |
|/ | |||||
* | added create contact dialog | iNPUTmice | 2014-07-10 | 2 | -3/+42 |
| | |||||
* | added contextual menu for contacts | iNPUTmice | 2014-07-10 | 2 | -0/+16 |
| | |||||
* | small changes | iNPUTmice | 2014-07-10 | 2 | -9/+12 |
| | |||||
* | theming for tabs in start conversation | iNPUTmice | 2014-07-10 | 26 | -12/+34 |
| | |||||
* | filter contacts and starting confercenes | iNPUTmice | 2014-07-10 | 1 | -6/+6 |
| | |||||
* | added group add button | iNPUTmice | 2014-07-10 | 2 | -16/+21 |
| | |||||
* | added action bar menu to start conversation | iNPUTmice | 2014-07-10 | 2 | -0/+29 |
| | |||||
* | changed support lib to v13. added tabs and fragments to start conversation ↵ | iNPUTmice | 2014-07-10 | 2 | -1/+10 |
| | | | | activity | ||||
* | moved hint box to the bottom | iNPUTmice | 2014-07-10 | 2 | -50/+63 |
| | |||||
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-09 | 1 | -5/+11 |
|\ | |||||
| * | Merge pull request #245 from beriain/development | Daniel Gultsch | 2014-07-08 | 1 | -5/+11 |
| |\ | | | | | | | Update strings.xml and fix some strings | ||||
| | * | Update strings.xml | Aitor Beriain | 2014-07-07 | 1 | -5/+11 |
| | | | |||||
* | | | unified warnings/error msgs | iNPUTmice | 2014-07-09 | 9 | -124/+33 |
|/ / | |||||
* | | uniformed colors. made colors a little material | iNPUTmice | 2014-07-08 | 23 | -108/+107 |
| | | |||||
* | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-07 | 2 | -29/+120 |
|\| | |||||
| * | Merge pull request #256 from kruks23/development | Daniel Gultsch | 2014-07-07 | 1 | -0/+2 |
| |\ | | | | | | | Update Spanish Translations | ||||
| | * | Update Spanish Translations | kruks23 | 2014-07-07 | 1 | -0/+2 |
| | | | |||||
| * | | Merge pull request #257 from BenoitBouvarel/development | Daniel Gultsch | 2014-07-07 | 1 | -29/+118 |
| |\ \ | | |/ | |/| | French translation updated | ||||
| | * | Update strings.xml | Benoit Bouvarel | 2014-07-07 | 1 | -31/+25 |
| | | | |||||
| | * | French translation updated | Benoit Bouvarel | 2014-07-07 | 1 | -3/+98 |
| | | | |||||
* | | | changed icons to light | iNPUTmice | 2014-07-07 | 59 | -6/+4 |
|/ / | |||||
* / | styled action bar green | iNPUTmice | 2014-07-07 | 1 | -0/+23 |
|/ | |||||
* | small ui overhauls. unified text sizes. made text a bit smaller. moved ↵ | iNPUTmice | 2014-07-04 | 12 | -33/+48 |
| | | | | messages more closer together | ||||
* | fixed #247 | iNPUTmice | 2014-07-04 | 1 | -3/+3 |
| | |||||
* | Update translation | Wenzel Pünter | 2014-07-03 | 1 | -2/+2 |
| | |||||
* | Add missing German translations | Wenzel Pünter | 2014-07-03 | 1 | -9/+94 |
| | |||||
* | fixed some tiny ui glitches | iNPUTmice | 2014-07-02 | 2 | -4/+4 |
| | |||||
* | removed old notification icon | iNPUTmice | 2014-06-30 | 3 | -0/+0 |
| | |||||
* | added error message for #240 | iNPUTmice | 2014-06-30 | 1 | -0/+1 |
| | |||||
* | Merge pull request #237 from kruks23/development | Daniel Gultsch | 2014-06-30 | 1 | -2/+6 |
|\ | | | | | Update Spanish Translations | ||||
| * | Update Spanish Translations | kruks23 | 2014-06-29 | 1 | -2/+6 |
| | | |||||
* | | more error handling for jingle connections | iNPUTmice | 2014-06-29 | 1 | -0/+1 |
|/ | |||||
* | made warnings in chats i tiny bit smaller | iNPUTmice | 2014-06-27 | 2 | -13/+18 |
| | |||||
* | Update spanish mins ago | kruks23 | 2014-06-24 | 1 | -2/+2 |
| | |||||
* | added rendering script for artwork | iNPUTmice | 2014-06-24 | 10 | -0/+0 |
| | |||||
* | new logo | iNPUTmice | 2014-06-23 | 11 | -0/+0 |
| | |||||
* | removed duplicate entries | iNPUTmice | 2014-06-21 | 1 | -4/+0 |
| | |||||
* | Merge branch 'development' of https://github.com/beriain/Conversations into ↵ | iNPUTmice | 2014-06-20 | 1 | -240/+249 |
|\ | | | | | | | | | | | | | beriain-development Conflicts: res/values-eu/strings.xml | ||||
| * | Update strings.xml | Aitor Beriain | 2014-06-18 | 1 | -3/+6 |
| | |