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 837b9224cc Merge https://github.com/redmatrix/redmatrix into pending_merge ...

Conflicts:
	doc/credits.bb
	mod/thing.php

2015-09-02 20:33:58 -07:00

..

dba

…

Import

…

photo

initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.

2015-09-01 22:03:10 -07:00

RedDAV

photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.

2015-08-06 17:09:09 -07:00

AccessList.php

start to modularise the clone import and sync functions

2015-09-02 20:12:40 -07:00

account.php

…

acl_selectors.php

…

activities.php

Merge branch 'master' into tres

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

api.php

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

2015-08-26 23:00:59 -07:00

apps.php

initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.

2015-09-01 22:03:10 -07:00

attach.php

change attach_store to allow a predefined item to accompany a photo

2015-08-26 22:13:20 -07:00

auth.php

…

BaseObject.php

start formatting for Doxygen

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

bb2diaspora.php

…

bbcode.php

personal oembed black/white list

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

bookmarks.php

…

cache.php

…

chat.php

…

cli_startup.php

…

cli_suggest.php

…

comanche.php

Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-07-23 21:07:35 -07:00

config.php

…

contact_selectors.php

…

contact_widgets.php

…

Contact.php

remove orphan mod_connections editing code (now done in mod/connedit)

2015-08-24 01:28:13 -07:00

conversation.php

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

2015-08-26 20:22:50 -07:00

ConversationObject.php

…

cronhooks.php

…

crypto.php

…

datetime.php

Correcting reported Doxygen syntax warnings.

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

deliver.php

…

dir_fns.php

…

directory.php

…

enotify.php

DB changes for some channel flags

2015-06-15 17:28:52 -07:00

environment.php

…

event.php

edited event showing bad signature and null_date for edit timestamp

2015-08-24 01:46:54 -07:00

expire.php

DB changes for some channel flags

2015-06-15 17:28:52 -07:00

externals.php

…

features.php

…

follow.php

these were some really difficult bugs to find

2015-08-03 21:13:17 -07:00

gprobe.php

…

group.php

use consistent terminology

2015-08-19 21:17:24 -07:00

html2bbcode.php

…

html2plain.php

…

hubloc.php

initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.

2015-09-01 22:03:10 -07:00

identity.php

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

2015-09-01 22:27:00 -07:00

import.php

start to modularise the clone import and sync functions

2015-09-02 20:12:40 -07:00

importdoc.php

separate objs/things from taxonomy

2015-09-01 17:06:58 -07:00

ItemObject.php

consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.

2015-05-18 21:32:55 -07:00

ITemplateEngine.php

…

items.php

initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.

2015-09-01 22:03:10 -07:00

js_strings.php

…

language.php

…

menu.php

more work on AccessList integration

2015-08-27 22:20:30 -07:00

message.php

obscure mail subject in conversation structure

2015-09-01 22:59:06 -07:00

nav.php

…

network.php

initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.

2015-09-01 22:03:10 -07:00

notifier.php

begin moving diaspora to plugin

2015-08-02 17:38:34 -07:00

notify.php

…

oauth.php

…

oembed.php

personal oembed black/white list

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

onedirsync.php

…

onepoll.php

…

page_widgets.php

…

permissions.php

…

photos.php

more AccessList stuff - this time it's mod-item, which is a biggie

2015-08-28 14:21:49 -07:00

plugin.php

…

poller.php

initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.

2015-09-01 22:03:10 -07:00

probe.php

…

profile_selectors.php

…

ProtoDriver.php

start formatting for Doxygen

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

queue_fn.php

…

queue.php

…

ratenotif.php

ratenotif: loop oddity

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

reddav.php

make /cloud work again after all the shuffling this morning

2015-07-30 18:34:30 -07:00

security.php

…

session.php

don't try to optimise the session table. Just let it fragment and let the DB worry about it.

2015-08-24 16:05:51 -07:00

sharedwithme.php

…

smarty.php

provide os_mkdir to workaround permission issues with php mkdir

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

socgraph.php

…

spam.php

…

statistics_fns.php

…

system_unavailable.php

…

taxonomy.php

separate objs/things from taxonomy

2015-09-01 17:06:58 -07:00

template_processor.php

…

text.php

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

2015-09-02 20:33:58 -07:00

widgets.php

unclosed link tags

2015-08-30 23:01:39 -07:00

zot.php

start to modularise the clone import and sync functions

2015-09-02 20:12:40 -07:00