Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
friendica
|
37801dd6ed
|
also block outbound
|
2012-04-04 20:48:35 -07:00 |
|
|
friendica
|
0c7710681c
|
log disabled requests
|
2012-04-04 18:49:39 -07:00 |
|
|
friendica
|
62c60fd53d
|
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
|
2012-04-04 14:13:34 -07:00 |
|
|
friendica
|
5d35f0d54a
|
add title to D* posts
|
2012-04-01 19:16:13 -07:00 |
|
|
friendica
|
4e4f7ac79f
|
some reported warnings cleaned up
|
2012-03-28 20:50:09 -07:00 |
|
|
friendica
|
3aacc119a1
|
block filed items from deletion
|
2012-03-24 04:16:27 -07:00 |
|
|
friendica
|
58940175e1
|
wrong link in d* comment notifications
|
2012-03-16 15:07:45 -07:00 |
|
|
friendica
|
be1bd9ff4e
|
notification for disapora comments
|
2012-03-16 05:19:29 -07:00 |
|
|
friendica
|
2c7da5d0de
|
scale external images
|
2012-02-25 14:22:51 -08:00 |
|
|
friendica
|
9441ff5142
|
string update for 2.38
|
2012-02-24 22:47:43 -08:00 |
|
|
friendica
|
f9eddad44f
|
allow forum posts by followers on Diaspora
|
2012-02-22 19:56:28 -08:00 |
|
|
friendica
|
1b9c03f6fc
|
new notifications - implement storage
|
2012-02-18 02:57:42 -08:00 |
|
|
friendica
|
1b445d511b
|
another sql typo
|
2012-02-16 00:08:38 -08:00 |
|
|
friendica
|
ada2a555dc
|
sql typo in auto-friend with D*
|
2012-02-15 23:58:28 -08:00 |
|
|
friendica
|
a869bd2fe5
|
don't link tags enclosed inside Diaspora links
|
2012-02-07 02:16:28 -08:00 |
|
|
friendica
|
8fe5168259
|
restore diaspora test mode
|
2012-01-26 20:46:42 -08:00 |
|
|
friendica
|
11aa83742e
|
more logging of D* photo transactions
|
2012-01-22 15:25:29 -08:00 |
|
|
friendica
|
8aa2552372
|
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
|
2012-01-18 16:21:30 -08:00 |
|
|
friendica
|
5b809328af
|
send diaspora share notification back to originator for auto friending
|
2012-01-05 13:25:43 -08:00 |
|
|
friendica
|
d0b743529d
|
support auto-friend page types for Diaspora
|
2012-01-04 14:30:25 -08:00 |
|
|
friendica
|
fc7d0360bb
|
add verb and item to notifications to aid in localisation
|
2012-01-03 20:26:20 -08:00 |
|
|
friendica
|
da21473c34
|
add notifications to d* private messages
|
2011-12-27 15:49:47 -08:00 |
|
|
friendica
|
dacbbfaafb
|
bug #188 diaspora_signed_retraction not removing post
|
2011-12-21 14:42:12 -08:00 |
|
|
friendica
|
63f66a5a93
|
bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly
|
2011-12-19 19:06:25 -08:00 |
|
|
friendica
|
79f3bbbf2b
|
more data checking, cleans up some infrequent php errors
|
2011-12-19 16:51:57 -08:00 |
|
|
friendica
|
7eba8adbf7
|
pm replies
|
2011-12-06 19:15:42 -08:00 |
|
|
friendica
|
0c24784f5e
|
include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)
|
2011-12-06 15:24:01 -08:00 |
|
|
friendica
|
be8e9d3616
|
d* pm
|
2011-12-06 00:16:13 -08:00 |
|
|
friendica
|
6fc9eae9de
|
more d* PM stuff
|
2011-12-04 17:26:55 -08:00 |
|
|
friendica
|
37730ecc2a
|
typo
|
2011-11-30 17:08:16 -08:00 |
|
|
friendica
|
aa73d38845
|
begininning d* conversation mode
|
2011-11-29 01:19:09 -08:00 |
|
|
friendica
|
ccef899577
|
start of d* private mail, dba without mysqli
|
2011-11-27 17:41:23 -08:00 |
|
|
friendica
|
cf7568efd7
|
extract private images before bbcode translation since preg has issues with large data sizes.
|
2011-11-27 04:09:14 -08:00 |
|
|
friendica
|
7b58de743a
|
add a few more sql indexes
|
2011-11-15 23:12:56 -08:00 |
|
Friendika
|
cf82174520
|
bug #198 - create activitystream 'friends with' message for Diaspora confirmations
|
2011-11-12 04:06:33 -08:00 |
|
|
Friendika
|
327105a4ea
|
try and fix diaspora multiple items queued issue
|
2011-11-06 16:48:13 -08:00 |
|
|
Friendika
|
f07c0b2cfb
|
implement signed_retractions
|
2011-11-05 14:45:29 -07:00 |
|
|
Friendika
|
0975ea8610
|
add attachments to Diaspora posts
|
2011-11-01 17:30:52 -07:00 |
|
|
Friendika
|
573670fa0c
|
more social graph stuff
|
2011-11-01 16:08:07 -07:00 |
|
|
Friendika
|
b025981858
|
yet more diaspora images to scale
|
2011-10-28 16:13:54 -07:00 |
|
|
Friendika
|
e5992003e8
|
better handling of remote urls - especially FB opengraph
|
2011-10-28 02:50:00 -07:00 |
|
|
Friendika
|
72d74b88be
|
some dspr fixes
|
2011-10-25 19:59:57 -07:00 |
|
|
Friendika
|
3512adda33
|
never enough comments
|
2011-10-23 19:05:32 -07:00 |
|
|
Friendika
|
6eea312c21
|
workaround for transmitting photos to D*
|
2011-10-23 16:01:04 -07:00 |
|
|
Friendika
|
6e76c86ad2
|
queue api + queue limits
|
2011-10-21 03:33:34 -07:00 |
|
|
Friendika
|
da416e0181
|
bug in diaspora_reshare
|
2011-10-20 05:43:33 -07:00 |
|
|
Friendika
|
96c0598737
|
diaspora_reshare - even more logging
|
2011-10-20 03:56:10 -07:00 |
|
|
Friendika
|
796056f810
|
provide link to missing d* images
|
2011-10-20 02:21:57 -07:00 |
|
|
Friendika
|
852ece39f4
|
more reshare logging to see what's going on
|
2011-10-20 02:07:38 -07:00 |
|
|
Friendika
|
33af8b0e20
|
diaspora_reshare - another try
|
2011-10-20 01:16:03 -07:00 |
|
|
Friendika
|
c4179d989f
|
more debug reshare
|
2011-10-19 21:34:48 -07:00 |
|
|
Friendika
|
10b2661176
|
suppress blank diaspora messages which are awaiting a photo that hasn't arrived
|
2011-10-19 15:18:41 -07:00 |
|
|
Friendika
|
19129e06c3
|
diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order
|
2011-10-19 15:08:16 -07:00 |
|
|
Friendika
|
1148cbab22
|
fix img link format diaspora share/asphoto
|
2011-10-19 00:29:43 -07:00 |
|
|
Friendika
|
9043e704f8
|
diaspora reshares
|
2011-10-18 15:56:35 -07:00 |
|
|
Friendika
|
32808a934d
|
string update
|
2011-10-18 04:28:36 -07:00 |
|
|
Friendika
|
fb5bddb98f
|
a few issues with diaspora_profile
|
2011-10-18 01:12:51 -07:00 |
|
|
Friendika
|
42a9817350
|
"cubbi.es"
|
2011-10-17 17:39:25 -07:00 |
|
|
Friendika
|
af6ab38100
|
diaspora birthday notifications
|
2011-10-14 00:20:37 -07:00 |
|
|
Friendika
|
05e26e4895
|
handle diaspora profile update message
|
2011-10-13 18:32:02 -07:00 |
|
|
Friendika
|
1d05c564d4
|
missing arg to diaspora_transmit from share/unshare
|
2011-10-07 15:49:41 -07:00 |
|
|
Friendika
|
ce11d231b8
|
use strpos instead of strstr, faster
|
2011-10-05 21:04:53 -07:00 |
|
|
Friendika
|
d0bef869db
|
ensure D* photos only attached once
|
2011-10-05 21:02:00 -07:00 |
|
|
Friendika
|
4c0ee7f41f
|
bug 173
|
2011-10-05 20:48:00 -07:00 |
|
|
Friendika
|
7d6a67f903
|
mostly cosmetic changes to make DB tables accurately reflect the conversation members
|
2011-10-05 19:16:05 -07:00 |
|
|
Friendika
|
4f9c072d66
|
requeue deliveries on 503 errors which have 'retry-after' headers
|
2011-09-27 19:27:47 -07:00 |
|
|
Friendika
|
8d3910c78c
|
sql error diaspora re-queue
|
2011-09-27 00:58:59 -07:00 |
|
|
Friendika
|
d6b446d63f
|
starting the big delivery shakeup
|
2011-09-22 04:11:39 -07:00 |
|
|
Friendika
|
9edf15d3ef
|
structures for batch mode (Diaspora/zot)
|
2011-09-20 01:49:08 -07:00 |
|
|
Friendika
|
97deaa3118
|
resume strict verification of Diaspora messages
|
2011-09-19 03:36:41 -07:00 |
|
|
Friendika
|
2aef98f71d
|
cripple account when expired
|
2011-09-19 01:17:12 -07:00 |
|
|
Friendika
|
48ee3fa3b9
|
build diaspora public (batch) message
|
2011-09-18 20:17:44 -07:00 |
|
|
Friendika
|
6c4ad7df3a
|
public D* post fix
|
2011-09-16 14:57:41 -07:00 |
|
|
Friendika
|
d7243be2ea
|
log the D* publc messages
|
2011-09-16 14:51:25 -07:00 |
|
|
Friendika
|
5a6a3cab8e
|
may fix diaspora send
|
2011-09-16 14:46:04 -07:00 |
|
|
Friendika
|
80f94bb12b
|
federation friday update
|
2011-09-15 17:47:16 -07:00 |
|
|
Friendika
|
5c0e135fe9
|
diaspora protocol changes
|
2011-09-14 19:33:42 -07:00 |
|
|
Friendika
|
c8f61ef890
|
no plink on imported D* posts
|
2011-09-03 05:23:36 -07:00 |
|
|
Friendika
|
0cfc8570d2
|
save plink for diaspora items so likes will point to right post
|
2011-08-31 21:46:37 -07:00 |
|
|
Friendika
|
f0a4a6af61
|
relayed likes did not verify
|
2011-08-30 19:20:56 -07:00 |
|
|
Friendika
|
0f1bc6e957
|
log every possible diaspora return for posts and comments
|
2011-08-29 22:50:41 -07:00 |
|
|
Friendika
|
454882812e
|
wrong time format string, 24hr clock
|
2011-08-29 18:01:59 -07:00 |
|
|
Friendika
|
391330d95f
|
better handling of relayed Diaspora comments
|
2011-08-29 00:51:08 -07:00 |
|
|
Friendika
|
846c4cea7c
|
implement delivery queue in case notifier gets killed
|
2011-08-28 21:41:42 -07:00 |
|
|
Friendika
|
f29f228463
|
bring Diaspora message signing back to the source author - whether they like it or not.
|
2011-08-28 19:22:27 -07:00 |
|
|
Friendika
|
4572f32603
|
cleanup
|
2011-08-28 05:04:49 -07:00 |
|
|
Friendika
|
41b00a6f3b
|
allow comment relaying for comments which were never Diaspora signed
|
2011-08-28 05:00:30 -07:00 |
|
|
Friendika
|
721db93e84
|
check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up
|
2011-08-26 17:52:24 -07:00 |
|
|
Friendika
|
506853adcd
|
break up delivery into per-person processes
|
2011-08-26 07:29:22 -07:00 |
|
|
Friendika
|
21c03fb522
|
diaspora2bb, salmon fix argument error
|
2011-08-25 16:37:27 -07:00 |
|
|
Friendika
|
a775474dff
|
cleaned up the conditions on when to and when not to relay.
|
2011-08-24 04:42:28 -07:00 |
|
|
Friendika
|
b6fdd3c76b
|
turn off notifier - runaway
|
2011-08-24 01:55:34 -07:00 |
|
|
Friendika
|
2aa23843e4
|
D* queue
|
2011-08-24 01:21:24 -07:00 |
|
|
Friendika
|
2cfdcee29a
|
author and owner sign exactly the same string - apparently
|
2011-08-23 19:54:35 -07:00 |
|
|
Friendika
|
6a052c3586
|
correct time in photo msg
|
2011-08-23 19:01:08 -07:00 |
|
|
Friendika
|
c1acea330c
|
photo fixes
|
2011-08-23 18:50:18 -07:00 |
|
|
Friendika
|
56d64316f4
|
diaspora photos ?
|
2011-08-23 18:17:35 -07:00 |
|
|
Friendika
|
8cfbe2c432
|
include bb2diaspora at top level
|
2011-08-23 03:02:31 -07:00 |
|
|
Friendika
|
561051e805
|
convert bbcode to markdown for diaspora (first try, will need tweaking)
|
2011-08-23 01:00:29 -07:00 |
|