aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* updated German translationChristian S2016-02-231-1/+2
|
* Merge branch 'siacs/master' into developmentChristian S2016-02-231-2/+3
|\
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-2/+3
| |
| * pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
| |
* | removed duplicate stringsChristian S2016-02-202-7/+0
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-2035-26/+77
|\|
| * 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 ↵Daniel Gultsch2016-02-162-16/+23
| | | | | | | | options to settings
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1532-2/+28
| |
| * pulled translations from transifexDaniel Gultsch2016-02-1511-9/+656
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-144-15/+51
|\|
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-122-2/+22
| |
| * pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
| |
| * allow user to set MAM preferencesDaniel Gultsch2016-02-093-15/+29
| |
* | added missing strings/translationsChristian S2016-02-062-1/+10
| |
* | removed duplicate stringChristian S2016-02-041-1/+0
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-043-0/+24
|\|
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-042-0/+10
| |
| * opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-012-0/+8
| |
| * refactored user handling in conferences. show try again button when ↵Daniel Gultsch2016-02-011-0/+1
| | | | | | | | conference has errors
* | Merge branch 'siacs/master'Christian S2016-01-314-1/+23
|\|
| * 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
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-235-14/+47
|\|
| * 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
| |
* | make actionbar title/subtitle clickableChristian S2016-01-232-3/+34
| | | | | | | | | | * show conference or contact details * hide button to show conference or contact details
* | show warning on back pressed during update checkChristian S2016-01-222-1/+8
| |
* | modfied some avatar sizesChristian S2016-01-163-6/+6
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-161-0/+1
|\|
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-151-2/+3
|\|
| * pulled translations for 1.9.0 release from transifexDaniel Gultsch2016-01-1420-26/+169
| |
* | rename axolotlChristian S2016-01-151-1/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-1329-45/+91
|\|
| * 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
| | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03.
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-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 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
| |