friendica/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 Changed markdown to enable diaspora postings with images that contain links 2012-08-02 01:46:28 +02:00
acl_selectors.php don't change to string in prune_deadguys() 2013-02-09 17:52:29 -07:00
api.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
attach.php add support for more file attachment types 2013-02-04 22:15:16 -07:00
auth.php delete cookie on browser close after logout 2012-12-24 12:52:49 -07:00
bb2diaspora.php bbcode: New element "share" for shared content 2012-12-17 03:01:40 +01:00
bbcode.php API: beautify the output of repeated items 2013-02-15 20:14:45 +01:00
cache.php
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 implement features 2012-11-22 09:14:22 -07:00
contact_widgets.php implement features 2012-11-22 09:14:22 -07:00
conversation.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
cronhooks.php use explicit include paths 2012-12-28 14:51:50 -07:00
crypto.php remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
datetime.php recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396 2012-07-15 21:00:11 -07:00
dba.php Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
dbupdate.php insidious set_config bug 2013-01-18 23:38:49 -07:00
delivery.php use explicit include paths 2012-12-28 14:51:50 -07:00
diaspora.php Merge branch 'master' of https://github.com/annando/friendica 2013-01-20 14:17:09 +01:00
directory.php use explicit include paths 2012-12-28 14:51:50 -07:00
dsprphotoq.php give post a chance to arrive before rejecting photos from Diaspora 2013-01-12 06:52:15 -07:00
email.php send less messages to server; remove delete option 2012-09-29 17:50:34 -06:00
EmailNotification.php
enotify.php add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. 2013-02-07 23:43:55 -08:00
event.php
expire.php use explicit include paths 2012-12-28 14:51:50 -07:00
fcontact.php
features.php features categories were un-translatable 2012-11-28 19:25:09 -08:00
follow.php Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
friendica_smarty.php allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
gprobe.php use explicit include paths 2012-12-28 14:51:50 -07:00
group.php prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists - 2012-12-13 21:02:14 -08:00
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
nav.php Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
network.php Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
notifier.php * Add MIME types for file attachments 2013-01-12 06:31:32 -07:00
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 if snautofollow - make all SN contacts writable 2012-12-29 02:51:15 -08:00
ostatus_conversation.php OStatus conversation are now checked every 30 minutes for new answers. 2013-02-04 00:57:23 +01:00
pgettext.php
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 OStatus conversation are now checked every 30 minutes for new answers. 2013-02-04 00:57:23 +01:00
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
quoteconvert.php
redir.php php warning 2012-11-22 03:19:05 -08:00
remoteupdate.php
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 We haven't Got Zot 2013-01-03 20:18:43 +00:00
system_unavailable.php
tags.php Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
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 email header encoding everywhere 2013-01-04 15:47:29 -08:00