aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/bottom.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-06-27 13:11:22 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-06-27 13:11:22 -0400
commit4f488c7e3cf1a4bc12e83dfdd44ede32283140ac (patch)
tree005db5d365a966743f04cf39518d9dc9f9568645 /view/theme/dispy/bottom.tpl
parent5b35a02d260d1f2573895c29f4710b08348ee8ba (diff)
parent3968e71d4c24a0dfd37a14545dc159c5f83155c6 (diff)
downloadvolse-hubzilla-4f488c7e3cf1a4bc12e83dfdd44ede32283140ac.tar.gz
volse-hubzilla-4f488c7e3cf1a4bc12e83dfdd44ede32283140ac.tar.bz2
volse-hubzilla-4f488c7e3cf1a4bc12e83dfdd44ede32283140ac.zip
Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: Friendicaland - couple of new 'countries' insidious little parsing bug have no idea why the if/endif macro block was getting printed and not processed. highlight js events-reminder on birthday events moved api direct message formating to own function. added same formating to direct reply message, when posting a new message. fixed direct message reply in api call. modified api message reply to set title to conversion title, when replying. add reliable way to get server version make it selectable I want HTML code! new param getUserObjects to avoid retransmitting the whole user info objects bugfix changes on api_direct_messages_box to allow to retrieve conversations and all messages modified direct_messages added replyto and subject to direct messages. modified conversion to use x function for parameter checking.
Diffstat (limited to 'view/theme/dispy/bottom.tpl')
0 files changed, 0 insertions, 0 deletions