aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-295-70/+28
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-2910-84/+52
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-1/+1
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-2/+23
|\| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-255-13/+31
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-7/+25
| * | be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * | don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-221-25/+37
|\ \ \ | | |/ | |/|
* | | Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-1/+1
|\ \ \
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
| |\| |
* | | | fixed merge errorslookshe2016-03-202-19/+25
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-174-59/+100
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66
| * | added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| * | fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-151-1/+1
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-1/+1
|\| |
* | | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-3/+3
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-113-77/+11
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-113-16/+7
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-2/+1
|\| |
* | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-081-17/+20
|\| |
* | | Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-081-6/+31
* | | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0steckbrief2016-03-081-1/+1
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0813-200/+365
|\ \ \ | | |/ | |/|
| * | don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-063-4/+17
| * | warn in conversations when account is disabledDaniel Gultsch2016-03-061-1/+14
| * | Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...Daniel Gultsch2016-03-041-0/+10
| |\ \
| | * | Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 06:53:30 +0000