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.

friendica 912be23e16 Merge branch 'master' into tres ...

Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php

2015-01-29 15:09:35 -08:00

..

dba

added dbdriver to siteinfo json to better track affected sites

2014-11-22 13:27:52 -08:00

Import

slow progress removing bitfields on item table

2015-01-21 16:06:25 -08:00

photo

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

RedDAV

local_user => local_channel

2015-01-28 20:56:04 -08:00

account.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

acl_selectors.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

activities.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

api.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

apps.php

remote_user => remote_channel

2015-01-28 20:58:59 -08:00

attach.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

auth.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

BaseObject.php

start formatting for Doxygen

2013-02-25 17:09:40 -08:00

bb2diaspora.php

more expanding item flags

2015-01-22 18:41:10 -08:00

bbcode.php

recognise opus as an audio file

2015-01-25 12:41:08 -08:00

bookmarks.php

remove some code duplication

2014-07-14 01:38:16 -07:00

cache.php

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

chat.php

fix improper group by usage

2015-01-28 17:36:24 -08:00

cli_startup.php

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

cli_suggest.php

populate initial suggestions (ultimately we want to do this at install time as well as from the poller so that new sites have friend suggestions when they create their first channel).

2013-08-05 20:08:35 -07:00

comanche.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

config.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

contact_selectors.php

convert application strings to en-US

2014-07-31 02:33:34 -07:00

contact_widgets.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

Contact.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

conversation.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

ConversationObject.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

cronhooks.php

start formatting for Doxygen

2013-02-25 17:09:40 -08:00

crypto.php

optionally use openssl encryption functions (higher performance over mcrypt, but potentially more likely to have been compromised)

2015-01-11 15:13:45 -08:00

datetime.php

Use grouped select field for timezone selection

2015-01-01 14:44:50 +01:00

deliver.php

Merge remote-tracking branch 'upstream/master'

2014-11-13 13:06:31 -08:00

diaspora.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

dir_fns.php

working through the xchan table to remove bitfields, mostly complete except for updating the updater

2015-01-20 19:33:19 -08:00

directory.php

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

enotify.php

Merge branch 'master' into tres

2015-01-27 20:00:43 -08:00

event.php

slow progress removing bitfields on item table

2015-01-21 16:06:25 -08:00

expire.php

start on item_restrict conversion

2015-01-22 21:04:54 -08:00

externals.php

slow progress removing bitfields on item table

2015-01-21 16:06:25 -08:00

features.php

turn "large photo thumbnails" into a feature.

2015-01-25 13:49:10 -08:00

follow.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

gprobe.php

start formatting for Doxygen

2013-02-25 17:09:40 -08:00

group.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

html2bbcode.php

I'm speechless. This is just reckless. Set a context flag in text using a context trigger character which is likely to be present in that text already. Without escaping any previous instances of that character. Grrr.

2014-10-23 21:20:12 -07:00

html2plain.php

cleanup

2013-03-10 20:39:27 -07:00

hubloc.php

working through the xchan table to remove bitfields, mostly complete except for updating the updater

2015-01-20 19:33:19 -08:00

identity.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

ItemObject.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

ITemplateEngine.php

use smarty3 as default template engine. add pluggable template system

2013-05-08 03:51:38 -04:00

items.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

js_strings.php

Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...".

2014-09-20 16:34:48 -07:00

language.php

Revert "Revert "Language names via intl library.""

2014-12-31 10:42:08 +01:00

menu.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

message.php

local_user => local_channel

2015-01-28 20:56:04 -08:00

nav.php

remote_user => remote_channel

2015-01-28 20:58:59 -08:00

network.php

Merge branch 'master' into tres and add some work on the item_deleted flag refactor

2015-01-26 18:27:03 -08:00

notifier.php

more message restrict conversions

2015-01-29 14:51:41 -08:00

notify.php

heavy lifting converting item flag bits

2015-01-22 17:41:16 -08:00

oauth.php

oauth wasn't logging in properly, also fixed api status_show to return last public post, not the last private post

2013-10-15 15:51:20 -07:00

oembed.php

recognise opus as an audio file

2015-01-25 12:41:08 -08:00

onedirsync.php

Merge branch 'master' into tres and add some work on the item_deleted flag refactor

2015-01-26 18:27:03 -08:00

onepoll.php

provide storage for directory based reputation in the xlink table by setting xlink_static = 1, so that xlink_static = 0 is traditional poco linkages

2015-01-26 19:13:06 -08:00

page_widgets.php

clean up the webpage list a bit

2014-04-29 18:28:05 -07:00

permissions.php

Use grouped select field for role selection

2015-01-01 15:54:16 +01:00

photos.php

more message restrict conversions

2015-01-29 14:51:41 -08:00

plugin.php

detect https coming through reverse proxy or load balancer using x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled

2015-01-05 16:12:55 -08:00

poller.php

Merge branch 'master' into tres

2015-01-27 20:00:43 -08:00

probe.php

start of legacy probe utility

2014-04-02 16:26:39 -07:00

profile_selectors.php

make the profile minimal by default. Use features to enable the advanced form.

2014-08-01 01:24:03 -07:00

ProtoDriver.php

start formatting for Doxygen

2013-02-25 17:09:40 -08:00

queue_fn.php

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

queue.php

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

reddav.php

PostgreSQL support initial commit

2014-11-13 12:21:58 -08:00

security.php

remote_user => remote_channel

2015-01-28 20:58:59 -08:00

session.php

Merge remote-tracking branch 'upstream/master'

2014-11-13 13:06:31 -08:00

smarty.php

provide os_mkdir to workaround permission issues with php mkdir

2014-07-16 01:07:00 -07:00

socgraph.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

spam.php

The problem with a lot of packages is that it's easier to re-write them than to re-use them.

2014-02-02 21:25:52 -08:00

statistics_fns.php

heavy lifting converting item flag bits

2015-01-22 17:41:16 -08:00

system_unavailable.php

start formatting for Doxygen

2013-02-25 17:09:40 -08:00

taxonomy.php

more message restrict conversions

2015-01-29 14:51:41 -08:00

template_processor.php

fix internal

2013-05-08 04:00:05 -04:00

text.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

widgets.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00

zot.php

Merge branch 'master' into tres

2015-01-29 15:09:35 -08:00