aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-2/+8
|\ | | | | | | | | Conflicts: mod/impel.php
| * fix for forked thread on diasporaredmatrix2015-05-271-0/+5
| |
| * some work on issue #329redmatrix2015-05-251-2/+3
| |
* | add rot47 to the mix. This shouldn't affect the speed to any measurable degree.redmatrix2015-05-191-6/+6
| |
* | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵redmatrix2015-05-191-9/+7
| | | | | | | | cipher would be adequate for our requirements.
* | Merge branch 'master' into tresredmatrix2015-05-171-4/+5
|\ \
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-171-4/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
| | * missing $redmatrix2015-05-171-1/+1
| | |
| | * more work isolating the projectname from core.redmatrix2015-05-171-4/+4
| | |
* | | Merge branch 'master' into tresredmatrix2015-05-141-7/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
| | * rev updateredmatrix2015-05-101-1/+1
| | |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-061-0/+15
| |\|
| | * turn consensus items into diaspora polls for that networkredmatrix2015-05-051-0/+15
| | |
| * | no need to obscure the diaspora signature if we're not obscuring the postsredmatrix2015-05-061-2/+2
| | |
| * | first pass name changeredmatrix2015-05-051-5/+5
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-108/+236
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * mod_connections ajax failure see ↵friendica2015-03-291-0/+51
| | | | | | | | http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression
| * catche edge case of tag "@abcdef +1", which tags the first entry in your ↵friendica2015-03-241-3/+3
| | | | | | | | abook, regardless of abcdef. This holds true for other similar patterns as well.
| * create terms for Diaspora mention tags - which in Diaspora are handled ↵friendica2015-03-131-3/+97
| | | | | | | | differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
| * invoke tgroup_check() on diaspora posts/comments in case the recipient is a ↵friendica2015-03-131-19/+34
| | | | | | | | forum with channel_w_stream permissions restricted.
| * don't relay diaspora comments to sys channelfriendica2015-03-111-0/+6
| |
| * change default affinity (abook_closeness) to 80 for all new connections ↵friendica2015-03-081-1/+7
| | | | | | | | going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness
| * Diaspora tag replacement was wretchedly buggy. Use our standard tag ↵friendica2015-02-191-129/+27
| | | | | | | | replacement calls instead.
| * diaspora: move reshare encapsulation after tag parsing, since it seriously ↵friendica2015-02-191-13/+12
| | | | | | | | screws up the tag parser and reshares end up with a lot of unlinked tags.
| * The Diaspora communications policies allow comments to public posts ↵friendica2015-02-171-17/+35
| | | | | | | | literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page.
| * provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵friendica2015-02-121-2/+2
| | | | | | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
| * apply max_import_size to Diaspora postsfriendica2015-02-091-0/+43
| |
* | Merge branch 'master' into tresfriendica2015-02-081-6/+4
|\| | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css
| * generate the correct service permalinkfriendica2015-02-081-6/+4
| |
* | Merge branch 'master' into tresfriendica2015-02-051-19/+36
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * over-ride permissions for sys channel delivery from diasporafriendica2015-02-051-9/+13
| |
| * another issue with diaspora postings to sys channel - sys has no ↵friendica2015-02-051-6/+14
| | | | | | | | connections, hence no abook records.
| * diaspora public posts not delivering to sys channel if there were no other ↵friendica2015-02-041-4/+9
| | | | | | | | subscribers
* | Merge branch 'master' into tresfriendica2015-02-011-1/+1
|\|
| * issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
| |
* | Merge branch 'master' into tresfriendica2015-01-291-22/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * implement diaspora profile message (oops) or updated profile photos won't be ↵friendica2015-01-291-21/+4
| | | | | | | | updated
| * make sure we honour the disable_discover_tab preffriendica2015-01-281-1/+5
| |
| * allow diaspora posts to be delivered to the discover channel unless ↵friendica2015-01-281-1/+5
| | | | | | | | prohibited from doing so.
* | Merge branch 'master' into tres and add some work on the item_deleted flag ↵friendica2015-01-261-1/+1
|\| | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
* | start on item_restrict conversionfriendica2015-01-221-6/+6
| |
* | more expanding item flagsfriendica2015-01-221-1/+1
| |
* | heavy lifting converting item flag bitsfriendica2015-01-221-2/+2
| |
* | slow progress removing bitfields on item tablefriendica2015-01-211-11/+4
|/
* friendica commenters are currently shown using "Diaspora" app. Try and fix ↵friendica2014-11-201-1/+6
| | | | this where we can.
* change logging of some troublesome or noisy bits so we can figure out what ↵friendica2014-11-191-1/+1
| | | | is really going on
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-131-11/+10
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php
| * logging changes, untranslated stringfriendica2014-11-051-1/+1
| |
| * ok heads up - potentially destabilising change. I've tried to sort out all ↵friendica2014-11-041-10/+9
| | | | | | | | | | | | | | | | | | | | the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes. What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected. With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:39:03 +0000