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

..

_well_known.php

make it easier to plug into .well_known, for instance to tell the EFF to fuck off and not block pages from the free web just because they use cookies.

2014-05-06 22:25:36 -07:00

achievements.php

Move achievements on, but just a tad.

2014-09-02 02:34:04 +01:00

acl.php

Merge branch 'master' into tres

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

admin.php

Merge branch 'master' into tres

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

api.php

local_user => local_channel

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

appman.php

local_user => local_channel

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

apps.php

local_user => local_channel

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

attach.php

unquote binary

2015-04-13 16:18:11 -07:00

authtest.php

local_user => local_channel

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

block.php

missing mod/block

2014-03-05 17:06:46 -08:00

blocks.php

disable voting in blocks, layouts and webpages

2015-04-29 21:36:53 +02:00

bookmarks.php

local_user => local_channel

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

branchtopic.php

reset route

2015-04-24 00:59:02 -07:00

channel.php

convert ITEM_WALL from bitfield to standalone

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

chanview.php

local_user => local_channel

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

chat.php

local_user => local_channel

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

chatsvc.php

PostgreSQL support initial commit

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

cloud.php

second pass name change

2015-05-05 03:59:51 -07:00

common.php

comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using.

2013-12-11 14:54:36 -08:00

connect.php

local_user => local_channel

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

connections.php

Merge branch 'master' into tres

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

connedit.php

convert ITEM_WALL from bitfield to standalone

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

contactgroup.php

local_user => local_channel

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

dav.php

second pass name change

2015-05-05 03:59:51 -07:00

directory.php

issue #157, provide default directory sort order

2015-04-19 23:04:14 -07:00

dirsearch.php

Merge branch 'master' into tres

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

display.php

Merge branch 'master' into tres

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

editblock.php

webpages blocks fixes

2015-04-23 21:04:01 +02:00

editlayout.php

Merge branch 'master' into tres

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

editpost.php

Merge branch 'master' into tres

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

editwebpage.php

Merge branch 'master' into tres

2015-04-29 21:49:43 -07:00

events.php

Merge branch 'master' into tres

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

fbrowser.php

local_user => local_channel

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

feed.php

allow feed paging

2014-10-29 17:55:15 -07:00

filer.php

Merge branch 'master' into tres

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

filerm.php

local_user => local_channel

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

filestorage.php

wording and css fixes

2015-04-16 23:46:12 +02:00

follow.php

local_user => local_channel

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

fsuggest.php

local_user => local_channel

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

group.php

Merge branch 'master' into tres

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

hcard.php

local_user => local_channel

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

help.php

remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.

2015-05-13 17:59:45 -07:00

home.php

Merge branch 'master' into tres

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

hostxrd.php

snakebite: bring back some of the legacy XML discovery interfaces, update as required.

2014-04-02 14:56:20 -07:00

id.php

Correcting reported Doxygen syntax warnings.

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

impel.php

Merge branch 'master' into tres

2015-04-29 21:49:43 -07:00

import.php

Merge branch 'master' into tres

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

invite.php

first pass name change

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

item.php

Merge branch 'master' into tres

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

lang.php

move language selector to a module

2014-03-05 03:19:20 -08:00

layouts.php

Merge branch 'master' into tres

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

like.php

Merge branch 'master' into tres

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

lockview.php

bring lockview to menu items, slightly change the way /lockview is called

2015-04-21 22:45:54 +02:00

locs.php

Merge branch 'master' into tres

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

login.php

local_user => local_channel

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

lostpass.php

PostgreSQL support initial commit

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

magic.php

channel delegation

2015-03-10 02:23:14 -07:00

mail.php

local_user => local_channel

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

manage.php

convert ITEM_WALL from bitfield to standalone

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

match.php

Correcting reported Doxygen syntax warnings.

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

menu.php

rework and hopefully improve webpage menu creation workflow

2015-04-21 10:05:26 +02:00

message.php

local_user => local_channel

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

mitem.php

missing translation

2015-05-11 17:50:17 -07:00

mood.php

convert ITEM_WALL from bitfield to standalone

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

msearch.php

remove the private keywords stuff to reduce directory and search complexity

2012-12-26 03:49:50 -08:00

network.php

Merge branch 'master' into tres

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

new_channel.php

Use grouped select field for role selection

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

notes.php

local_user => local_channel

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

notifications.php

local_user => local_channel

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

notify.php

local_user => local_channel

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

oembed.php

oembed issues

2014-10-08 20:37:46 -07:00

oexchange.php

remote_user => remote_channel

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

online.php

missing file in checkin

2014-01-28 20:15:57 -08:00

openid.php

Merge branch 'master' into tres

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

opensearch.php

lotsa little fixes

2012-10-21 22:11:02 -07:00

p.php

convert ITEM_WALL from bitfield to standalone

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

page.php

Merge branch 'master' into tres

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

parse_url.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

pdledit.php

local_user => local_channel

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

photo.php

issue #777, make photo cache time configurable, read the comments.

2014-12-27 18:19:51 -08:00

photos.php

Merge branch 'master' into tres

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

ping.php

Merge branch 'master' into tres

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

poco.php

abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality.

2015-01-25 16:27:09 -08:00

poke.php

Merge branch 'master' into tres

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

post.php

Merge branch 'master' into tres

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

prate.php

final cleanup on ratings feature

2015-02-03 21:19:29 -08:00

pretheme.php

more mod cleanups

2012-10-22 19:18:50 +11:00

probe.php

let the site admin import a record directly from the probe diagnostic

2015-05-11 19:36:07 -07:00

profile_photo.php

local_user => local_channel

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

profile.php

remote_user => remote_channel

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

profiles.php

local_user => local_channel

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

profperm.php

local_user => local_channel

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

pubsites.php

second pass name change

2015-05-05 03:59:51 -07:00

randprof.php

Correcting reported Doxygen syntax warnings.

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

rate.php

pubsites ratings (mod/pubsites really really needs to be templatised, this was quick and dirty)

2015-02-16 01:17:15 -08:00

ratings.php

force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy.

2015-02-15 23:45:22 -08:00

ratingsearch.php

force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy.

2015-02-15 23:45:22 -08:00

rbmark.php

local_user => local_channel

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

receive.php

undo these bits of trinidad - we're going to do things differently

2015-01-05 18:22:15 -08:00

regdir.php

fix regdir

2015-03-31 21:06:48 -07:00

register.php

PostgreSQL support initial commit

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

regmod.php

cleanup of old delegation stuff

2015-03-10 20:19:17 -07:00

regver.php

implement service class for feed polling frequenecy, fixed a service class bug, moved service class stuff from plugin to account.php where it belongs and load that by default instead of on demand

2014-09-03 19:07:14 -07:00

removeaccount.php

cleanup of old delegation stuff

2015-03-10 20:19:17 -07:00

removeme.php

cleanup of old delegation stuff

2015-03-10 20:19:17 -07:00

rmagic.php

try and add some regs

2015-03-12 15:19:54 -07:00

rpost.php

allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes

2015-04-17 11:20:22 +02:00

rsd_xml.php

more notes

2012-11-16 16:09:22 -08:00

search_ac.php

local_user => local_channel

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

search.php

issue #178, searching for words such as 'data' would return private items regardless of their unobscured content.

2015-04-19 23:16:17 -07:00

service_limits.php

local_user => local_channel

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

settings.php

add generic_addon_settings template and minor fixes

2015-03-12 22:22:52 +01:00

setup.php

second pass name change

2015-05-05 03:59:51 -07:00

share.php

Correcting reported Doxygen syntax warnings.

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

sharedwithme.php

sql in -> IN

2015-03-23 11:06:13 +01:00

siteinfo.php

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

2015-05-13 17:07:12 -07:00

sitelist.php

fix implicit boolean

2015-01-28 17:34:53 -08:00

smilies.php

Access list of smilies over JSON

2014-12-20 17:33:35 +01:00

sources.php

local_user => local_channel

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

sslify.php

Should fix issue #704

2014-11-19 21:10:19 -08:00

starred.php

Merge branch 'master' into tres

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

subthread.php

convert ITEM_WALL from bitfield to standalone

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

suggest.php

add common connection count to suggestions

2015-04-07 18:13:10 -07:00

tagger.php

Merge branch 'master' into tres

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

tagrm.php

local_user => local_channel

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

thing.php

convert ITEM_WALL from bitfield to standalone

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

toggle_mobile.php

More steps for mobile theme toggling + dash elimination

2013-08-19 01:08:15 +02:00

toggle_safesearch.php

Don't let nobody set an xconfig in safe search.

2013-12-11 15:35:19 +00:00

uexport.php

local_user => local_channel

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

update_channel.php

allow embedded content via ajax on page load

2013-02-23 01:27:43 -08:00

update_display.php

allow embedded content via ajax on page load

2013-02-23 01:27:43 -08:00

update_home.php

yet another option for the homepage

2014-11-20 17:38:41 -08:00

update_network.php

silence some warnings at php E_ALL levels

2013-08-28 21:56:01 -07:00

update_search.php

get search page working with live-update and endless scroll, still not perfect - there may be duplicated content and possibly unauthorised content and 'timeago' not working correctly - will deal with those later, but at least you can see results.

2013-05-09 18:08:00 -07:00

view.php

wrong app name

2013-10-16 00:17:16 -07:00

viewconnections.php

Merge branch 'master' into tres

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

viewsrc.php

Merge branch 'master' into tres

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

wall_attach.php

switch from IMG_XXX constants to IMAGETYPE_XXX constants

2015-04-19 18:06:42 -04:00

wall_upload.php

Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.

2015-03-10 15:43:15 -07:00

webfinger.php

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

2012-04-05 13:39:15 +02:00

webpages.php

Merge branch 'master' into tres

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

wfinger.php

webfinger enhancements: per RFC7033

2014-03-25 16:44:19 -07:00

xchan.php

Fixed a variable conflict in mod/xchan.php.

2014-11-14 00:45:25 +01:00

xpoco.php

abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality.

2015-01-25 16:27:09 -08:00

xrd.php

store diaspora meta info in the item table. It has to go there or it will kill us with complex joins. We can phase out the sign table once this all checks out.

2014-09-03 05:09:43 -07:00

xref.php

Reduce life of xref cookie per Opinion 04/2012 on Cookie Consent Exemption.

2013-12-23 04:58:12 +00:00

zfinger.php

Merge branch 'master' into tres

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

zotfeed.php

improve performance of the zotfeed queries

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

zping.php

local_user => local_channel

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