This repository has been archived on 2024-08-19. You can view files and clone it, but cannot push or open issues or pull requests.

friendica 4b348d2489 Merge branch 'master' into tres ...

Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css

2015-02-05 19:38:43 -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-02-05 19:38:43 -08:00

auth.php

local_user => local_channel

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

BaseObject.php

…

bb2diaspora.php

more expanding item flags

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

bbcode.php

author profile photo in reshare wasn't linked

2015-02-05 14:46: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

…

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-31 00:50:20 -08:00

conversation.php

Merge branch 'master' into tres

2015-02-05 19:38:43 -08:00

ConversationObject.php

Merge branch 'master' into tres

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

cronhooks.php

…

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

cleanup event form and various required indicators on inputs

2015-01-29 20:09:48 -08: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-02-05 19:38:43 -08:00

dir_fns.php

Merge branch 'master' into tres

2015-02-05 19:38:43 -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

…

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

…

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-02-05 19:38:43 -08:00

ItemObject.php

Merge branch 'master' into tres

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

ITemplateEngine.php

…

items.php

Merge branch 'master' into tres

2015-02-05 19:38:43 -08:00

js_strings.php

final cleanup on ratings feature

2015-02-03 21:19:29 -08: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

prevent silly fake null date from causing problems OTW from older builds

2015-01-30 16:15:05 -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

Merge branch 'master' into tres

2015-02-05 19:38:43 -08:00

notify.php

heavy lifting converting item flag bits

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

oauth.php

…

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-02-01 20:30:47 -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

…

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

ratenotif.php

send rating information to directories

2015-02-02 20:13:07 -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

…

taxonomy.php

more message restrict conversions

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

template_processor.php

…

text.php

Merge branch 'master' into tres

2015-02-05 19:38:43 -08:00

widgets.php

Merge branch 'master' into tres

2015-02-05 19:38:43 -08:00

zot.php

Merge branch 'master' into tres

2015-02-05 19:38:43 -08:00