aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-2648-60/+826
|\
| * show password dialog when account was magic createdDaniel Gultsch2016-05-193-0/+25
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-2/+2
| * cap messages after 256 lines in UIDaniel Gultsch2016-05-162-0/+2
| * improve keyboard handling. fixes #1387Daniel Gultsch2016-05-121-0/+1
| * use 'phone' or 'tablet' as default resourceDaniel Gultsch2016-05-123-1/+9
| * report host-account as account state in UIDaniel Gultsch2016-05-101-0/+1
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-8/+1
| * report bind failure as account stateDaniel Gultsch2016-05-051-0/+1
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-0/+2
| * pulled translations from transifexDaniel Gultsch2016-05-044-2/+21
| * use app name in resource suggestionsDaniel Gultsch2016-05-031-1/+1
| * pulled translations from transifexDaniel Gultsch2016-05-0215-41/+353
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-291-0/+1
| * cleaned up captcha dialogDaniel Gultsch2016-04-282-2/+28
| * renamed welcome header to untranslatable 'Start your Conversations'Daniel Gultsch2016-04-271-1/+1
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-262-10/+13
| * add change prescence to manage account context menuDaniel Gultsch2016-04-231-0/+3
| * show status messages in contact detailsDaniel Gultsch2016-04-231-16/+19
| * expert setting to manually change presenceDaniel Gultsch2016-04-2218-2/+198
| * put welcome screen in scrollviewDaniel Gultsch2016-04-221-62/+67
| * added magic create welcome screenDaniel Gultsch2016-04-198-0/+159
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-0/+23
|\ \
| * \ Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1844-117/+170
| |\ \
| * | | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-172-0/+23
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-182-8/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-182-8/+1
| * | | removed unused stringlookshe2016-04-171-1/+0
| * | | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1744-116/+177
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1744-145/+178
|\ \ \ | | |/ | |/|
| * | add setting for quick sharingDaniel Gultsch2016-04-142-15/+26
| * | added share uri button to conference detailsDaniel Gultsch2016-04-1214-14/+26
| * | pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| * | introduced setting to turn of notification ledDaniel Gultsch2016-04-092-4/+11
| * | pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| * | pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+1
|\ \ \ | | |/ | |/|
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
| * | conversations->conversations+lookshe2016-04-0329-327/+327
| * | Pulled translations from transifexlookshe2016-04-012-25/+31
* | | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-0630-0/+0
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-012-25/+31
|\ \ \
| * | | Pulled translations from transifexlookshe2016-04-012-25/+31
| |/ /
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-1/+1
|\| |
| * | no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+13
|\| |
| * | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+4
|\| |
| * | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-0/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 03:25:49 +0000