aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (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-2620-242/+837
|\
| * show password dialog when account was magic createdDaniel Gultsch2016-05-191-0/+22
| * improved ordering of muc participantsDaniel Gultsch2016-05-171-6/+1
| * offer offline members to be invited againDaniel Gultsch2016-05-171-1/+1
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-161-3/+9
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-163-34/+29
| * show presence of other resources as templateDaniel Gultsch2016-05-131-2/+2
| * improve keyboard handling. fixes #1387Daniel Gultsch2016-05-122-6/+50
| * check if pgpengine is still bound before using itDaniel Gultsch2016-05-122-1/+4
| * scroll to bottom after sending multi-line messageDaniel Gultsch2016-05-121-2/+8
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-8/+0
| * republish pgp signature when changing statusDaniel Gultsch2016-05-056-17/+84
| * clear password field before setting new oneDaniel Gultsch2016-05-041-0/+1
| * fixed npe when calling changepassword activity directlyDaniel Gultsch2016-05-041-2/+4
| * show only username when registering account with magic createDaniel Gultsch2016-05-021-12/+21
| * properly cancel avatar tasksDaniel Gultsch2016-04-293-5/+8
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-292-2/+12
| * port all android drop down list items to our ownDaniel Gultsch2016-04-293-10/+9
| * catch rare NPE when determining max http sizeDaniel Gultsch2016-04-291-3/+3
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-51/+41
| * removed unused config variablesDaniel Gultsch2016-04-276-51/+11
| * made it possible to go back to welcome screen from edit accountDaniel Gultsch2016-04-272-4/+7
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-263-13/+69
| * add change prescence to manage account context menuDaniel Gultsch2016-04-232-3/+13
| * show status messages in contact detailsDaniel Gultsch2016-04-231-1/+23
| * expert setting to manually change presenceDaniel Gultsch2016-04-2211-23/+247
| * added magic create welcome screenDaniel Gultsch2016-04-194-4/+163
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-093-9/+10
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-5/+5
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-182-4/+1
|\| |
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-175-11/+56
|\ \ \ | | |/ | |/|
| * | add setting for quick sharingDaniel Gultsch2016-04-141-2/+25
| * | hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-131-2/+2
| * | added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+17
| * | fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
| * | don't show contact details when in conversations with selfDaniel Gultsch2016-04-092-1/+4
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-2/+11
| * | prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-068-78/+57
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-056-10/+43
|\ \ \ | | |/ | |/|
| * | don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-022-5/+4
| * | check max http file size when attaching filesDaniel Gultsch2016-04-013-6/+39
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-311-1/+1
| * | save otr fingerprint in messageDaniel Gultsch2016-03-312-3/+3
* | | fixed installation error "W/PackageManager: Can't install because provider na...trz/beta-1lookshe2016-04-031-1/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-011-1/+6
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-301-1/+3
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-0/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-20/+9
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 10:26:06 +0000