This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Michael Vogel a81af2e042 Merge remote branch 'upstream/master' ...

Conflicts:
	include/bb2diaspora.php

2012-06-23 12:50:00 +02:00

..

markdownify

New function to convert bbcode to markdown.

2012-06-17 19:49:05 +02:00

acl_selectors.php

…

api.php

Added ORDER BY clause for conversation view

2012-06-21 12:55:03 +02:00

attach.php

…

auth.php

handle multiple underscores in D* links

2012-05-26 23:46:42 -07:00

bb2diaspora.php

Merge remote branch 'upstream/master'

2012-06-23 12:50:00 +02:00

bbcode.php

New option in the bbcode parser to disable oembed.

2012-06-18 01:29:08 +02:00

cache.php

…

config.php

rev update

2012-06-16 17:29:42 -07:00

contact_selectors.php

…

contact_widgets.php

…

Contact.php

better handling of dead contacts

2012-06-14 16:56:46 -07:00

conversation.php

Added App::get_cached_avatar_image usage on conversation wall of Normal View

2012-06-19 16:05:39 -07:00

cronhooks.php

…

crypto.php

…

datetime.php

add missing bracket

2012-06-13 20:41:53 +02:00

dba.php

Disabled logging of SQL statements

2012-05-29 16:16:37 +02:00

delivery.php

first shot at getting like/unlike functions to work consistently

2012-06-03 14:53:30 -06:00

diaspora.php

Merge remote branch 'upstream/master'

2012-06-23 12:50:00 +02:00

directory.php

rev update, bug 428, 429, and ability to block globaldir submissions from demo sites

2012-05-21 16:40:11 -07:00

email.php

…

EmailNotification.php

…

enotify.php

Typo breaking tag notifications

2012-06-18 22:00:18 +01:00

event.php

Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning

2012-05-29 19:03:30 +00:00

expire.php

…

fcontact.php

…

follow.php

ostatus hub subscription issues

2012-06-07 19:53:39 -07:00

gprobe.php

…

group.php

…

html2bbcode.php

…

html2plain.php

…

items.php

undefined unmark_for_death

2012-06-20 16:35:49 -07:00

message.php

…

msgclean.php

…

nav.php

Now using App::get_cached_avatar_image for navigation bar

2012-06-19 16:05:39 -07:00

network.php

Add support for PNG images with alpha

2012-06-07 17:42:13 +02:00

notifier.php

first shot at getting like/unlike functions to work consistently

2012-06-03 14:53:30 -06:00

oauth.php

…

oembed.php

OEmbed: Don't output the width of images

2012-06-18 08:49:35 +02:00

onepoll.php

rev update

2012-06-16 03:35:45 -07:00

pgettext.php

…

Photo.php

exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there

2012-06-18 20:21:54 -07:00

pidfile.php

…

plugin.php

plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook

2012-06-19 18:26:40 -07:00

poller.php

variable confusion in poller, don't allow negative page offsets

2012-06-11 17:24:16 -07:00

profile_advanced.php

add hometown to profiles

2012-06-02 20:58:20 -07:00

profile_selectors.php

add plugin hooks to gender, sexpref, and marital selectors

2012-05-27 22:35:01 -07:00

profile_update.php

…

queue_fn.php

fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.

2012-06-13 19:59:20 -07:00

queue.php

…

quoteconvert.php

…

remoteupdate.php

…

salmon.php

…

Scrape.php

show last.fm source in username

2012-06-20 23:04:55 -07:00

security.php

…

session.php

…

socgraph.php

keep FB out of private notes

2012-05-22 21:20:31 -07:00

system_unavailable.php

…

template_processor.php

…

text.php

fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.

2012-06-13 19:59:20 -07:00

user.php

Add support for PNG images with alpha

2012-06-07 17:42:13 +02:00