dir/include
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
..
markdownify
acl_selectors.php
api.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
attach.php
auth.php delete cookie on browser close after logout 2012-12-24 12:52:49 -07:00
bb2diaspora.php
bbcode.php
cache.php use mysql replace on cache items 2012-05-02 16:27:19 -07:00
config.php insidious set_config bug 2013-01-18 23:38:49 -07:00
Contact.php Reset network when showing a contact's posts 2013-02-01 09:12:37 +01:00
contact_selectors.php
contact_widgets.php
conversation.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
cronhooks.php
crypto.php remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
datetime.php
dba.php
dbupdate.php insidious set_config bug 2013-01-18 23:38:49 -07:00
delivery.php
diaspora.php
directory.php
dsprphotoq.php
email.php
EmailNotification.php
enotify.php
event.php
expire.php
fcontact.php
features.php features categories were un-translatable 2012-11-28 19:25:09 -08:00
follow.php
friendica_smarty.php
gprobe.php
group.php
html2bbcode.php try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
html2plain.php * Add MIME types for file attachments 2013-01-12 06:31:32 -07:00
items.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
lock.php don't check for was_recently_delayed in diaspora_transmit during a queue run 2012-07-09 09:39:09 -06:00
message.php fix wallmessage 2012-11-14 13:59:31 -08: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
network.php Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
notifier.php
oauth.php api: add 'allow_api' to user authenticated via oauth 2012-12-27 10:20:51 -05:00
oembed.php divide by zero on incorrectly specified oembed thumbnail size 2012-12-16 17:58:12 -08:00
onepoll.php
ostatus_conversation.php
pgettext.php rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07:00
Photo.php improve performance of photo upload page 2012-11-25 19:34:54 -08:00
pidfile.php
plugin.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
poller.php
profile_advanced.php
profile_selectors.php
profile_update.php
queue.php die forcefully but gracefully on missing api templates 2013-01-23 17:07:55 -08:00
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
quoteconvert.php
redir.php
remoteupdate.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
salmon.php
Scrape.php Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
security.php fix bug that wouldn't show posts to a user who was in an allowed group when individual contacts were also specified in the permissions 2013-02-04 20:27:30 -07:00
session.php
socgraph.php
system_unavailable.php
tags.php
template_processor.php Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
text.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
uimport.php uimport: check check to ensure the username isn't already taken before import (issue 508) 2012-11-13 04:52:32 -05:00
user.php