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.

redmatrix edeba4ca34 Merge https://github.com/redmatrix/redmatrix into pending_merge ...

Conflicts:
	include/api.php

2015-10-13 16:19:25 -07:00

..

dba

…

Import

…

photo

import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.

2015-09-26 13:25:34 -07:00

RedDAV

…

AccessList.php

…

account.php

notification changes to support testdrive

2015-10-01 19:49:06 -07:00

acl_selectors.php

…

activities.php

…

api.php

Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-10-13 16:19:25 -07:00

apps.php

…

attach.php

file migration - continued

2015-10-13 16:16:51 -07:00

auth.php

…

BaseObject.php

…

bb2diaspora.php

…

bbcode.php

…

bookmarks.php

…

cache.php

…

chat.php

…

checksites.php

add site_type to queries, first few - several more to go.

2015-09-28 04:21:29 -07:00

cli_startup.php

…

cli_suggest.php

…

comanche.php

…

config.php

…

contact_selectors.php

…

contact_widgets.php

…

Contact.php

one more change

2015-10-01 19:54:28 -07:00

conversation.php

…

ConversationObject.php

…

cronhooks.php

…

crypto.php

…

datetime.php

…

deliver_hooks.php

delivery optimisations

2015-09-24 22:51:47 -07:00

deliver.php

wrong table column names

2015-09-29 22:51:06 -07:00

dir_fns.php

create site records for all queued sites and check for death

2015-09-28 17:13:11 -07:00

directory.php

…

DReport.php

…

enotify.php

Red:Notify > Hubzilla:Notify

2015-10-03 15:51:12 +02:00

environment.php

…

event.php

Document the additional content export options

2015-09-24 16:57:17 -07:00

expire.php

…

externals.php

add site_type to queries, first few - several more to go.

2015-09-28 04:21:29 -07:00

features.php

…

follow.php

…

gprobe.php

…

group.php

…

html2bbcode.php

…

html2plain.php

…

hubloc.php

add site_type to queries, first few - several more to go.

2015-09-28 04:21:29 -07:00

identity.php

add plugin hooks to channel sync/import/export

2015-09-23 18:27:04 -07:00

import.php

…

importdoc.php

…

ItemObject.php

…

ITemplateEngine.php

…

items.php

fix typo in 0b1cd826b0

2015-09-29 11:56:43 +02:00

js_strings.php

…

language.php

move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

2015-09-26 23:44:30 -07:00

menu.php

…

message.php

some heavy private mail restructuring - work in progress

2015-09-24 14:07:44 +02:00

nav.php

some heavy private mail restructuring - work in progress

2015-09-24 14:07:44 +02:00

network.php

…

notifier.php

need full path to deliver_hooks.php

2015-10-02 04:51:57 -07:00

notify.php

…

oauth.php

…

oembed.php

…

onedirsync.php

…

onepoll.php

…

page_widgets.php

…

permissions.php

…

photos.php

…

plugin.php

…

poller.php

…

probe.php

…

profile_selectors.php

…

ProtoDriver.php

…

queue_fn.php

…

queue.php

wrong table column names

2015-09-29 22:51:06 -07:00

ratenotif.php

…

reddav.php

…

security.php

add one more level of parentheses to ensure operator precedence is correctly evaluated

2015-09-28 20:03:11 -07:00

session.php

…

sharedwithme.php

…

smarty.php

…

socgraph.php

…

spam.php

…

statistics_fns.php

…

system_unavailable.php

…

taxonomy.php

Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-10-01 17:30:15 -07:00

template_processor.php

…

text.php

functions to update urls in items when doing migrations

2015-10-06 20:30:49 -07:00

widgets.php

remove check mail - it just reloads the page. we get a notification in the panel if we get new mail

2015-10-04 13:43:16 +02:00

zot.php

Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-10-01 17:30:15 -07:00