aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-241-274/+303
|\
| * Update license string with librariesAndreas Straub2015-08-151-0/+4
| * Display error message if all contact keys purgedAndreas Straub2015-08-151-0/+2
| * show HTTP upload availability on Edit account screenhlad2015-08-141-0/+1
| * provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-101-1/+3
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-12/+11
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-0/+3
| * temporarily renamed new encryption method to 'Multi-End' until a better name ...Daniel Gultsch2015-08-011-10/+10
| * removed expert setting to 'force encryption'. merged certifcate and encryptio...Daniel Gultsch2015-07-311-1/+0
| * Highlight selected message's fingerprint in listAndreas Straub2015-07-291-0/+1
| * show warning when trying to highlight users that have left the conferenceDaniel Gultsch2015-07-221-0/+1
| * treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-2/+2
| * allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-211-0/+1
| * Add purge axolotl key optionAndreas Straub2015-07-201-0/+3
| * Add clear devices to overflow menu in EditAccountAndreas Straub2015-07-191-0/+2
| * Ask for key trust when sending messagesAndreas Straub2015-07-191-0/+3
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-0/+2
| * Display axolotl chat message hintAndreas Straub2015-07-191-0/+1
| * Add basic PEP managemend UI to EditAccountActivityAndreas Straub2015-07-191-0/+6
| * CryptoNext Menu entries addedAndreas Straub2015-07-191-0/+1
| * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-161-1/+1
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-2/+1
| * renamed colorsDaniel Gultsch2015-07-131-0/+1
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-0/+1
| * refactored message context menuDaniel Gultsch2015-07-021-3/+2
| * replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-021-404/+409
| * Add option to remove manually approved certificatesBrianBlade2015-04-191-0/+11
| * Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...iNPUTmice2015-04-141-1/+3
| |\
| | * Add option to use MTM without default TrustManagerBrianBlade2015-04-111-0/+2
| * | Enable end-conversation by swipe gestureBrianBlade2015-04-081-0/+3
| |/
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-129/+152
* | changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-141-3/+4
* | added settings for accepting and downloading fileslookshe2015-04-121-1/+7
* | differ between received and read messagelookshe2015-04-111-1/+3
* | no trim of messages or passwordlookshe2015-04-111-0/+3
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-0/+14
|\|
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-181-0/+4
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-0/+2
| * display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-0/+3
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+4
| * added actions to error notificationiNPUTmice2015-02-101-0/+1
* | Merge master-originsteckbrief2015-02-201-15/+53
|\|
| * Remove title_activity_conversations and use app_name insteadkruks232015-01-301-1/+0
| * Use Material Design Icons on API 21+Sam Whited2015-01-291-0/+1
| * show checkbox to hide offline contactsiNPUTmice2015-01-211-0/+1
| * Remove legacy SSL supportSam Whited2015-01-191-2/+0
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+2
| * use same helper methods for images and filesiNPUTmice2015-01-181-7/+3
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+2
| |\
| | * Added new file type names for file transfersChristian S2015-01-181-0/+2