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.

redmatrix a6cb90c81c Merge branch 'master' into tres ...

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

2015-05-14 18:02:29 -07:00

..

dba

Some cleanups.

2015-03-13 00:36:32 +01:00

Import

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

photo

started to add the ability to geotag photos (default will be disabled) but my phone isn't outputting the GPS tags even after being explicitly enabled so I'll have to wait until I've got a device that I can reliably test against.

2015-03-16 20:08:05 -07:00

RedDAV

first pass name change

2015-05-05 03:56:10 -07:00

account.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02:00

acl_selectors.php

local_user => local_channel

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

activities.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

api.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

apps.php

remote_user => remote_channel

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

attach.php

convert ITEM_WALL from bitfield to standalone

2015-05-06 21:03:33 -07:00

auth.php

explicitly unset delegate session vars on logout

2015-03-23 17:51:43 -07:00

BaseObject.php

…

bb2diaspora.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

bbcode.php

missed one...

2015-05-06 22:56:08 -07:00

bookmarks.php

Some cleanups and documentation.

2015-03-04 00:15:24 +01:00

cache.php

PostgreSQL support initial commit

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

chat.php

Some documentation, fix chatroom service class lookup.

2015-03-14 00:10:06 +01:00

cli_startup.php

PostgreSQL support initial commit

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

cli_suggest.php

…

comanche.php

provide a method for loading site/custom widgets

2015-05-12 18:11:54 -07:00

config.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02: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

improvements in duplicate like detection, especially w/r/t event participation

2015-02-10 17:49:46 -08:00

conversation.php

for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts

2015-05-05 18:36:05 -07:00

ConversationObject.php

Merge branch 'master' into tres

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

cronhooks.php

…

crypto.php

issue #941

2015-03-28 14:53:00 -07:00

datetime.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02:00

deliver.php

more work on queue optimisations

2015-03-09 19:57:35 -07:00

diaspora.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

dir_fns.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07:00

directory.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02:00

enotify.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

event.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

expire.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07:00

externals.php

convert ITEM_WALL from bitfield to standalone

2015-05-06 21:03:33 -07:00

features.php

move some lesser used features to plugins

2015-03-29 16:44:26 -07:00

follow.php

Fix missing value in insert for default closeness

2015-03-09 03:07:48 -03:00

gprobe.php

…

group.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07: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

Merge branch 'master' into tres

2015-04-23 19:49:41 -07:00

identity.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

ItemObject.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07:00

ITemplateEngine.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02:00

items.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

js_strings.php

issue #162

2015-04-20 20:49:55 -07:00

language.php

product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons.

2015-05-13 16:01:00 -07:00

menu.php

uid > channel id to make submenus visible for observers

2015-05-10 21:52:48 +02: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

adjust icon size

2015-05-07 10:35:22 +02:00

network.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

notifier.php

convert ITEM_WALL from bitfield to standalone

2015-05-06 21:03:33 -07:00

notify.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07:00

oauth.php

…

oembed.php

make embeds bookmarkable

2015-03-11 18:12:04 -07: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

more logging for onepoll

2015-03-31 20:01:37 -07:00

page_widgets.php

clean up the webpage list a bit

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

permissions.php

use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos.

2015-04-21 21:41:39 -07:00

photos.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

plugin.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02:00

poller.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07: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

more work on queue optimisations

2015-03-09 19:57:35 -07:00

ratenotif.php

ratenotif: loop oddity

2015-03-19 15:24:09 -07:00

reddav.php

first pass name change

2015-05-05 03:56:10 -07:00

security.php

improve performance of the zotfeed queries

2015-03-23 19:56:10 -07:00

session.php

Some cleanups.

2015-03-13 00:36:32 +01:00

sharedwithme.php

make postgresql happy

2015-03-25 11:03:37 +01: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-04-29 21:49:43 -07: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

convert ITEM_WALL from bitfield to standalone

2015-05-06 21:03:33 -07:00

system_unavailable.php

…

taxonomy.php

convert ITEM_WALL from bitfield to standalone

2015-05-06 21:03:33 -07:00

template_processor.php

Correcting reported Doxygen syntax warnings.

2015-03-29 22:23:00 +02:00

text.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00

widgets.php

Merge branch 'master' into tres

2015-04-23 19:49:41 -07:00

zot.php

Merge branch 'master' into tres

2015-05-14 18:02:29 -07:00