Michael Vogel 4e220ec391 Merge commit 'upstream/master'

2012-04-14 13:15:25 +02:00

..

acl_selectors.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

api.php

API: Improved the timeline. Several (disabled) tests with caching of photos.

2012-04-11 19:31:01 +02:00

attach.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

auth.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

bb2diaspora.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

bbcode.php

Several improvements

2012-03-31 16:28:39 +02:00

cache.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

config.php

revert config changes, we're getting duplicate keys

2012-04-06 03:10:46 -07:00

contact_selectors.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

contact_widgets.php

visit "random profile" feature

2012-04-10 20:50:31 -07:00

Contact.php

stray debug statements, forgot to filter pending contacts

2012-04-12 23:14:41 -07:00

conversation.php

Merge commit 'upstream/master'

2012-04-11 19:35:51 +02:00

cronhooks.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

crypto.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

datetime.php

more sane defaults datetime_convert

2012-04-08 18:09:21 -07:00

dba.php

Merge commit 'upstream/master'

2012-04-13 00:10:41 +02:00

delivery.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

diaspora.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

directory.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

email.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

EmailNotification.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

enotify.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

event.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

expire.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

fcontact.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

group.php

bug #369 - show contacts who are not in any groups

2012-04-12 23:06:41 -07:00

html2bbcode.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

html2plain.php

html2plain: changed behaviour for the "hr" element.

2012-04-09 12:54:02 +02:00

items.php

table cleanup

2012-04-12 05:15:45 -07:00

message.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

msgclean.php

New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements

2012-03-17 11:07:49 +01:00

nav.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

network.php

validate_url allow naked subdomain if is "localhost"

2012-04-13 09:42:53 +02:00

notifier.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

oauth.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

oembed.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

pgettext.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Photo.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

pidfile.php

New script that checks if a script is running

2012-04-01 20:56:27 +02:00

plugin.php

ignore removed plugins

2012-04-06 05:21:42 -07:00

poller.php

Merge commit 'upstream/master'

2012-04-07 18:35:29 +02:00

profile_advanced.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

profile_selectors.php

one more

2012-04-13 17:39:12 -07:00

profile_update.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

queue_fn.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

queue.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

quoteconvert.php

New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements

2012-03-17 11:07:49 +01:00

remoteupdate.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

salmon.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

Scrape.php

Rename gravatar_img() more generic to avatar_img().

2012-04-09 21:22:09 +02:00

security.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

session.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

socgraph.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

system_unavailable.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

template_processor.php

ignore utf8 offset error for unit tests

2012-04-07 02:31:41 -07:00

text.php

move html out of lang_selector() and new template lang_selector.tpl

2012-04-13 11:56:21 +02:00