aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-283-4/+9
|\
| * disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
| * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| * Retry decryption from message menufiaxh2016-02-232-1/+4
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-2/+3
* | Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6
* | Removed stupid message correctionsteckbrief2016-02-2328-57/+0
* | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-2316-24/+0
* | merged string resourcessteckbrief2016-02-232-6/+0
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2261-202/+1709
|\|
| * pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
| * pulled translations from transifexDaniel Gultsch2016-02-1929-253/+212
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-4/+4
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-162-16/+23
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1532-2/+28
| * pulled translations from transifexDaniel Gultsch2016-02-1511-9/+656
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-122-2/+22
| * pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
* | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-164-15/+39
|\|
| * allow user to set MAM preferencesDaniel Gultsch2016-02-093-15/+29
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-042-0/+10
* | Unused preference 'picture_compression'. This feature is configured in our va...steckbrief2016-02-1319-52/+0
* | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-1221-47/+4
* | Fixed placeholder string for message input boxsteckbrief2016-02-122-2/+2
* | Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
* | Fixed XML errors after mergesteckbrief2016-02-116-8/+14
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-11158-2075/+6063
|\|
| * opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-012-0/+8
| * refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-0/+1
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-252-0/+8
| * added FormWrapper and form field validationDaniel Gultsch2016-01-231-0/+1
| * introduced boolean form field wrapperDaniel Gultsch2016-01-232-1/+14
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-221-0/+21
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-223-6/+11
| * increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| * pulled translations from transifexDaniel Gultsch2016-01-2015-13/+718
| * pulled translations from transifexDaniel Gultsch2016-01-164-3/+49
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+1
| * pulled translations for 1.9.0 release from transifex1.9.0Daniel Gultsch2016-01-1420-26/+169
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-0/+1
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-121-2/+2
| |\
| | * s/TOR/Tor/gSam Whited2016-01-121-2/+2
| * | pulled translations from transifexDaniel Gultsch2016-01-1225-75/+117
| |/
| * use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
| * Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-2/+0
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-0/+2
| * new art rendersDaniel Gultsch2016-01-1125-0/+0
| * don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| * pulled translations from transifexDaniel Gultsch2016-01-1125-63/+14
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-112-169/+216