Commit graph

150 commits

Author SHA1 Message Date
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