aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/UIHelper.java (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-261-0/+15
|\
| * include name in locations received in MUCsDaniel Gultsch2016-05-151-1/+1
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+17
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-13/+17
|\ \
* \ \ FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-4/+5
|\ \ \ | | |/ | |/|
| * | show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\ \ \ | | |/ | |/|
* | | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-4/+2
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-1/+4
|\ \ \ | | |/ | |/|
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+4
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-1/+3
|\| |
| * | Retry decryption from message menufiaxh2016-02-231-1/+3
* | | Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-281-6/+0
* | | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-6/+7
* | | Imports organizedsteckbrief2016-02-121-19/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-1/+7
|\| |
| * | handle null names in getColorForNameDaniel Gultsch2015-12-291-1/+1
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-21/+0
| * | Reset the margins manually after rotatingsaqura2015-10-261-0/+21
| * | Optimize importsAndreas Straub2015-07-201-6/+6
| * | made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-1/+2
| * | renamed downloadable to transferableDaniel Gultsch2015-07-101-10/+9
| * | show contacts name in non anonymous mucs. fixes #1213Daniel Gultsch2015-07-051-2/+6
| * | changed mime type handlingDaniel Gultsch2015-07-011-10/+1
| * | added a few location questionsDaniel Gultsch2015-05-141-3/+8
| * | ignore question marks in location questionDaniel Gultsch2015-05-131-10/+13
| * | show location quick action after receiving a question about the users locationDaniel Gultsch2015-05-131-0/+24
| * | optimized heart render code a bitDaniel Gultsch2015-05-101-3/+7
| * | added white heart to new rendering as wellDaniel Gultsch2015-05-101-0/+1
| * | paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-0/+4
* | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-0/+18
|\ \ \ | | |/ | |/|
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-369/+0
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-161-129/+0
* | | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-3/+3
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-22/+58
* | | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+14
|/ /
* | no trim of messages or passwordlookshe2015-04-111-2/+1
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-2/+8
|\|
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-1/+7
| * trim message bodys on displayDaniel Gultsch2015-02-071-1/+1
* | Merge master-originsteckbrief2015-02-201-8/+133
|\|
| * fixed text preview for imagesiNPUTmice2015-02-011-1/+1
| * fix mergable() for /me command.Michael2015-01-251-2/+3
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+8
| * use same helper methods for images and filesiNPUTmice2015-01-181-21/+8
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+4
| |\
| | * Added new file type names for file transfersChristian S2015-01-181-0/+4
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-2/+2
| |/
| * Correct the download file string on notificationsSam Whited2015-01-171-10/+12
| * handle muc nicks with white spaces. fixed #884iNPUTmice2015-01-141-2/+2