redmatrix
|
b2c5020af7
|
diaspora disallowed by default
|
2015-06-10 18:51:39 -07:00 |
|
redmatrix
|
eb6a1f8387
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-09 19:39:21 -07:00 |
|
redmatrix
|
d08c43d80c
|
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
|
2015-06-09 18:50:11 -07:00 |
|
redmatrix
|
b381ec5734
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/impel.php
|
2015-05-27 19:27:38 -07:00 |
|
redmatrix
|
3ecc9efd8d
|
fix for forked thread on diaspora
|
2015-05-27 16:01:51 -07:00 |
|
redmatrix
|
9a0264f5d2
|
some work on issue #329
|
2015-05-25 19:17:35 -07:00 |
|
redmatrix
|
507dfb9f85
|
add rot47 to the mix. This shouldn't affect the speed to any measurable degree.
|
2015-05-19 21:51:48 -07:00 |
|
redmatrix
|
77e2ef45f0
|
mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements.
|
2015-05-19 02:16:12 -07:00 |
|
redmatrix
|
7c7a5cba8f
|
Merge branch 'master' into tres
|
2015-05-17 19:49:36 -07:00 |
|
redmatrix
|
76558df966
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
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
|
2015-05-17 19:48:57 -07:00 |
|
redmatrix
|
ac3b886cc4
|
missing $
|
2015-05-17 19:00:17 -07:00 |
|
redmatrix
|
91d7b0f7eb
|
more work isolating the projectname from core.
|
2015-05-17 16:28:16 -07:00 |
|
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 |
|
redmatrix
|
0a644a2f41
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
|
2015-05-10 13:26:44 -07:00 |
|
redmatrix
|
3140650b8f
|
rev update
|
2015-05-10 13:17:41 -07:00 |
|
redmatrix
|
75b8bfc07a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-06 18:39:12 -07:00 |
|
redmatrix
|
f17c1f9694
|
no need to obscure the diaspora signature if we're not obscuring the posts
|
2015-05-06 18:38:30 -07:00 |
|
redmatrix
|
f559c91b7a
|
turn consensus items into diaspora polls for that network
|
2015-05-05 19:23:21 -07:00 |
|
redmatrix
|
a3c37f1458
|
first pass name change
|
2015-05-05 03:56:10 -07:00 |
|
friendica
|
6679734135
|
Merge branch 'master' into tres
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
|
2015-04-23 19:49:41 -07:00 |
|
friendica
|
c29d3fc08a
|
mod_connections ajax failure see http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression
|
2015-03-29 18:42:05 -07:00 |
|
friendica
|
c024668cf2
|
catche edge case of tag "@abcdef +1", which tags the first entry in your abook, regardless of abcdef. This holds true for other similar patterns as well.
|
2015-03-24 02:36:45 -07:00 |
|
friendica
|
b76cdf82d2
|
create terms for Diaspora mention tags - which in Diaspora are handled 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.
|
2015-03-13 19:24:17 -07:00 |
|
friendica
|
f458c29a2b
|
invoke tgroup_check() on diaspora posts/comments in case the recipient is a forum with channel_w_stream permissions restricted.
|
2015-03-13 14:48:44 -07:00 |
|
friendica
|
35fc14d6ab
|
don't relay diaspora comments to sys channel
|
2015-03-11 15:11:57 -07:00 |
|
friendica
|
b5683bfac4
|
change default affinity (abook_closeness) to 80 for all new connections 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
|
2015-03-08 14:11:38 -07:00 |
|
friendica
|
8db3677546
|
Diaspora tag replacement was wretchedly buggy. Use our standard tag replacement calls instead.
|
2015-02-19 16:29:49 -08:00 |
|
friendica
|
fc52536ce7
|
diaspora: move reshare encapsulation after tag parsing, since it seriously screws up the tag parser and reshares end up with a lot of unlinked tags.
|
2015-02-19 15:07:41 -08:00 |
|
friendica
|
e00be4de23
|
The Diaspora communications policies allow comments to public posts 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.
|
2015-02-17 19:47:36 -08:00 |
|
friendica
|
da2349bb6a
|
provide relief to sites that are severely impacted by the slow ITEM_UNSEEN 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.
|
2015-02-12 17:45:25 -08:00 |
|
friendica
|
55c3c54ef6
|
apply max_import_size to Diaspora posts
|
2015-02-09 19:54:48 -08:00 |
|
friendica
|
08b757a22c
|
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
|
2015-02-08 20:57:37 -08:00 |
|
friendica
|
64191de5e7
|
generate the correct service permalink
|
2015-02-08 18:31:51 -08:00 |
|
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 |
|
friendica
|
fe8a08a474
|
over-ride permissions for sys channel delivery from diaspora
|
2015-02-05 17:29:35 -08:00 |
|
friendica
|
153719a20a
|
another issue with diaspora postings to sys channel - sys has no connections, hence no abook records.
|
2015-02-05 16:13:26 -08:00 |
|
friendica
|
646a874390
|
diaspora public posts not delivering to sys channel if there were no other subscribers
|
2015-02-04 20:28:36 -08:00 |
|
friendica
|
aafed50a0e
|
Merge branch 'master' into tres
|
2015-02-01 20:30:47 -08:00 |
|
friendica
|
a7e5c7ce64
|
issue #885, autoperms not working for diaspora connections
|
2015-01-31 14:52:29 -08:00 |
|
friendica
|
912be23e16
|
Merge branch 'master' into tres
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
|
2015-01-29 15:09:35 -08:00 |
|
friendica
|
872b165eb2
|
implement diaspora profile message (oops) or updated profile photos won't be updated
|
2015-01-29 00:25:29 -08:00 |
|
friendica
|
54fd8b21db
|
make sure we honour the disable_discover_tab pref
|
2015-01-28 15:27:58 -08:00 |
|
friendica
|
2c02f1184c
|
allow diaspora posts to be delivered to the discover channel unless prohibited from doing so.
|
2015-01-28 15:23:00 -08:00 |
|
friendica
|
ac594183c6
|
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
|
2015-01-26 18:27:03 -08:00 |
|
friendica
|
4c2a1e572a
|
start on item_restrict conversion
|
2015-01-22 21:04:54 -08:00 |
|
friendica
|
6e0e3b2433
|
more expanding item flags
|
2015-01-22 18:41:10 -08:00 |
|
friendica
|
e46eba1258
|
heavy lifting converting item flag bits
|
2015-01-22 17:41:16 -08:00 |
|
friendica
|
29436081a8
|
slow progress removing bitfields on item table
|
2015-01-21 16:06:25 -08:00 |
|
friendica
|
78cb87343c
|
friendica commenters are currently shown using "Diaspora" app. Try and fix this where we can.
|
2014-11-20 02:54:55 -08:00 |
|
friendica
|
18cae8a78c
|
change logging of some troublesome or noisy bits so we can figure out what is really going on
|
2014-11-19 19:22:22 -08:00 |
|