Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | updated German translation | Christian S | 2016-02-23 | 1 | -1/+2 |
| | |||||
* | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 1 | -2/+3 |
|\ | |||||
| * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 1 | -2/+3 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-20 | 2 | -0/+49 |
| | | |||||
* | | removed duplicate strings | Christian S | 2016-02-20 | 2 | -7/+0 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 35 | -26/+77 |
|\| | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-19 | 29 | -253/+212 |
| | | |||||
| * | made clear that archiving preferences are server side | Daniel Gultsch | 2016-02-16 | 1 | -4/+4 |
| | | |||||
| * | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 2 | -16/+23 |
| | | | | | | | | options to settings | ||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 32 | -2/+28 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-15 | 11 | -9/+656 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-14 | 4 | -15/+51 |
|\| | |||||
| * | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 2 | -2/+22 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-11 | 5 | -16/+768 |
| | | |||||
| * | allow user to set MAM preferences | Daniel Gultsch | 2016-02-09 | 3 | -15/+29 |
| | | |||||
* | | added missing strings/translations | Christian S | 2016-02-06 | 2 | -1/+10 |
| | | |||||
* | | removed duplicate string | Christian S | 2016-02-04 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 3 | -0/+24 |
|\| | |||||
| * | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 2 | -0/+10 |
| | | |||||
| * | opt out handling of the autojoin flag. fixes #1666 | Daniel Gultsch | 2016-02-01 | 2 | -0/+8 |
| | | |||||
| * | refactored user handling in conferences. show try again button when ↵ | Daniel Gultsch | 2016-02-01 | 1 | -0/+1 |
| | | | | | | | | conference has errors | ||||
* | | Merge branch 'siacs/master' | Christian S | 2016-01-31 | 4 | -1/+23 |
|\| | |||||
| * | expert setting to trigger extended connection options | Daniel Gultsch | 2016-01-25 | 2 | -0/+8 |
| | | |||||
| * | added FormWrapper and form field validation | Daniel Gultsch | 2016-01-23 | 1 | -0/+1 |
| | | |||||
| * | introduced boolean form field wrapper | Daniel Gultsch | 2016-01-23 | 2 | -1/+14 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 5 | -14/+47 |
|\| | |||||
| * | added UI wrapper for (some) form fields | Daniel Gultsch | 2016-01-22 | 1 | -0/+21 |
| | | |||||
| * | changed spacing in create dialogs and notify user when no accounts are activated | Daniel Gultsch | 2016-01-22 | 3 | -6/+11 |
| | | |||||
| * | increased padding in create contact/conference dialog | Daniel Gultsch | 2016-01-21 | 2 | -15/+21 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-01-20 | 15 | -13/+718 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-01-16 | 4 | -3/+49 |
| | | |||||
* | | make actionbar title/subtitle clickable | Christian S | 2016-01-23 | 2 | -3/+34 |
| | | | | | | | | | | * show conference or contact details * hide button to show conference or contact details | ||||
* | | show warning on back pressed during update check | Christian S | 2016-01-22 | 2 | -1/+8 |
| | | |||||
* | | modfied some avatar sizes | Christian S | 2016-01-16 | 3 | -6/+6 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-16 | 1 | -0/+1 |
|\| | |||||
| * | show toast when image cropper get oom | Daniel Gultsch | 2016-01-15 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-15 | 1 | -2/+3 |
|\| | |||||
| * | pulled translations for 1.9.0 release from transifex | Daniel Gultsch | 2016-01-14 | 20 | -26/+169 |
| | | |||||
* | | rename axolotl | Christian S | 2016-01-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-13 | 29 | -45/+91 |
|\| | |||||
| * | show key fetch error in activity when there are no keys to be used | Daniel Gultsch | 2016-01-13 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| |\ | |||||
| | * | s/TOR/Tor/g | Sam Whited | 2016-01-12 | 1 | -2/+2 |
| | | | |||||
| * | | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 25 | -75/+117 |
| |/ | |||||
| * | use match_parent as height in conversations overview | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| | | |||||
| * | Revert "Add additional warnings to OMEMO purge key function" | Daniel Gultsch | 2016-01-12 | 1 | -2/+0 |
| | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. | ||||
| * | Add additional warnings to OMEMO purge key function | Andreas Straub | 2016-01-12 | 1 | -0/+2 |
| | | | | | | | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help... | ||||
| * | new art renders | Daniel Gultsch | 2016-01-11 | 25 | -0/+0 |
| | | |||||
| * | don't use the word phone in strings | Daniel Gultsch | 2016-01-11 | 1 | -6/+5 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-01-11 | 25 | -63/+14 |
| | |