aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Expand)AuthorAgeFilesLines
* introduces new message state modelsteckbrief2018-05-051-2/+5
* introduces cancel status for file transfers, fixes NPE in file sharing after ...steckbrief2018-02-161-0/+1
* Simplifying introduction of new XEP implementations, implements FS#250 and FS...steckbrief2017-08-071-0/+9
* Implements FS#217: Rework display of /me messagessteckbrief2017-08-021-1/+6
* Implements FS#247 and FS#248: Show online status and typing notification in t...steckbrief2017-08-021-0/+2
* Implements FS#106: Add expert setting to log xml tracesteckbrief2017-08-011-0/+2
* relates FS#241: Implementation of http download based on okhttpsteckbrief2017-02-061-0/+2
* Improved error handling for filetransfer:http:delete, Check for httpupload fe...steckbrief2017-01-111-0/+2
* Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-052-0/+4
|\
| * Added columns to fileparams table: url, original file name, key and ivsteckbrief2017-01-042-0/+4
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-0/+5
| |\ | |/ |/|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+1
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-2/+0
| |\ \
* | | | Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-291-0/+3
* | | | Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-231-0/+1
* | | | Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-221-0/+1
| |_|/ |/| |
* | | Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-183-4/+12
|\ \ \ | | |/ | |/|
| * | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-181-2/+0
| * | removed unused stringlookshe2016-04-171-1/+0
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-173-2/+13
| |\|
| | * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-173-4/+14
| | |\
| | | * add setting for quick sharingDaniel Gultsch2016-04-141-0/+4
| | | * added share uri button to conference detailsDaniel Gultsch2016-04-123-0/+4
| | | * introduced setting to turn of notification ledDaniel Gultsch2016-04-091-3/+5
| | | * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+1
| | |\ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+13
| | |\ \
* | | | | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-0/+1
|/ / / /
* | | | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
* | | | conversations->conversations+lookshe2016-04-031-14/+14
| |/ / |/| |
* | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-0/+1
|\| |
| * | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+1
| |\|
| | * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-0/+1
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-231-2/+2
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-202-0/+7
| |\ \
* | | | pulled from transifexlookshe2016-03-231-2/+2
| |/ / |/| |
* | | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-202-0/+7
* | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+3
|\| |
| * | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-0/+3
| |\|
| | * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-13/+0
| |\ \ | |/ / |/| |
* | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-111-13/+0
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-0/+6
|\| |
| * | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+6
| |\|
| | * warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
| | * show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| | * don't automatically crop avatarDaniel Gultsch2016-03-041-0/+1
| | * expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-0/+2
| | * let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 21:51:05 +0000