Commit Graph
24488 Commits
Author SHA1 Message Date
friendica c6d6c01fb6 use prepare_body in api calls to properly render content, add 'mode' to conversation templates so that themes can use the module context to suppress or show comments as desired 2013-09-16 22:40:53 -07:00
friendica 1c5d56eedc Merge https://github.com/friendica/red into zpull 2013-09-16 21:37:34 -07:00
friendica 9bff739d96 several oauth fixes - shred doesn't completely work yet, but it also doesn't completely NOT work, so at least there's some improvement 2013-09-16 21:35:52 -07:00
Thomas Willingham 8411fb2bf9 Merge pull request #139 from tazmandevil/master
fixed link to wiki
2013-09-16 20:11:41 -07:00
Tazman DeVille 6c308a2d72 fixed link to wiki 2013-09-17 04:52:36 +02:00
pixelroot 88ea4f80bc modified: view/ru/messages.po 2013-09-16 08:46:15 +02:00
friendica 4b5d91ccb5 found it 2013-09-15 23:02:18 -07:00
friendica f72cc77e46 spurious blank lines 2013-09-15 22:33:47 -07:00
friendica 9a2293df91 Merge https://github.com/friendica/red into zpull 2013-09-15 22:21:17 -07:00
friendica 4decbacda1 more logging 2013-09-15 22:19:24 -07:00
Thomas Willingham 3554bab83a Content wrapper breaks feature settings. Get rid of it as a quick fix until I get a chance to work out why it works everywhere except there. 2013-09-16 05:01:25 +01:00
friendica 603319bf63 Merge https://github.com/friendica/red into zpull 2013-09-15 19:09:21 -07:00
friendica b3575484c7 don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it. 2013-09-15 19:04:11 -07:00
Thomas Willingham 9442f2fa71 Merge pull request #137 from unary/fbrowser
fix photo file browser
2013-09-15 11:45:15 -07:00
Michael Johnston e1133ec1d0 fix photo file browser 2013-09-15 14:36:54 -04:00
friendica 033a9f67e7 Merge https://github.com/friendica/red into zpull 2013-09-15 03:52:37 -07:00
friendica 129a119c84 implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it. 2013-09-15 03:48:43 -07:00
friendica a7cd3f7dfe Merge pull request #136 from cvogeley/master
Search by date
2013-09-14 18:33:14 -07:00
Christian Vogeley 4132d1cd8e Upstream merge 2013-09-15 03:21:19 +02:00
Christian Vogeley 496f869157 Search by date
Search by date (archive) works a bit now
2013-09-15 03:18:18 +02:00
friendica aefb0f8233 fix the missing brace before pushing 2013-09-14 17:21:39 -07:00
friendica 053893b067 some fixes to directory keyword searches 2013-09-14 17:20:24 -07:00
friendica 7a3d415267 Merge https://github.com/friendica/red into zpull 2013-09-14 16:45:27 -07:00
friendica 44ed6b0adc no longer used 2013-09-14 16:45:14 -07:00
friendica d9f3073b60 Merge pull request #135 from unary/menuedit
allow update of menu_desc, fix bug in duplicate menu_name check
2013-09-14 16:25:18 -07:00
friendica 05c8a08ee5 Merge https://github.com/friendica/red into zpull 2013-09-14 16:12:05 -07:00
friendica a36cc949a1 this might fix "find channels" but I can't test the keyword search until this is running on a production site. 2013-09-14 16:11:15 -07:00
Michael Johnston ec7b462b18 set menu_channel_id before we use it in a query 2013-09-14 18:16:54 -04:00
Michael Johnston 0c4857e1a9 let me edit menu_desc even if menu_name has not changed 2013-09-14 17:59:44 -04:00
Olaf Conradi 1dd2a65210 Merge pull request #132 from pixelroot/master
modified:   view/ru/messages.po
2013-09-14 14:52:17 -07:00
Olaf Conradi 05649fa33a Revert broken commit 2013-09-14 23:39:40 +02:00
mrjive 095939f0d8 First try to tell a comment from a like/dislike in notification system 2013-09-14 20:28:56 +02:00
friendica 94417eecba import_xchan - check every known hubloc/location field and create a new hubloc if anything at all changed anywhere. 2013-09-14 01:56:25 -07:00
friendica 83e086edcd doc update, put more telemetry on notifier and try to ensure that private posts have recipients. 2013-09-13 04:51:55 -07:00
pixelroot b824552e13 modified: view/ru/messages.po 2013-09-13 12:06:08 +02:00
friendica cf87653a92 need to figure out what's causing this 2013-09-12 22:50:41 -07:00
friendica e9ea80f2f6 No point beating a dead horse 2013-09-12 21:54:15 -07:00
friendica 3a2d11bde1 so public_recips and allowed_public_recips is working so much better than before, but was still not quite right. We seem to be getting all the right results for top-level posts now, but comments aren't getting through on channels for which we've allowed them to send us their stream, but not comment on our posts. The reason is we were seeing if they could comment - and we only need to do that if we own the post. If they own the post, we only need to check if they can send us their stream. 2013-09-12 20:11:56 -07:00
friendica 037fd43fbd more remote error reporting for zot 2013-09-12 16:52:58 -07:00
friendica 816d764aec remove some debugging stuff now that the problem they were trying to locate down has been solved. 2013-09-12 03:26:24 -07:00
friendica 01775f4062 Merge pull request #130 from ndurchx/patch-1
Fixed error in SQL Statement
2013-09-12 02:41:56 -07:00
ndurchx bf3e7f5e9f Fixed error in SQL Statement 2013-09-12 11:39:07 +02:00
friendica ca1b8dbe1e Merge pull request #129 from MicMee/master
to flag failed auth attempts in db table hubloc as hubloc_receive_error
2013-09-12 02:26:56 -07:00
Michael Meer 2c06a2c163 implement tip from Mike, corrected the sql statement 2013-09-11 15:24:26 +02:00
Michael Meer 82f4b1767e delete logger line; was the wrong place. 2013-09-11 14:05:33 +02:00
Michael Meer 2228264772 flag failed auth attempts in DB table hubloc 2013-09-11 13:59:45 +02:00
friendica d593b40d9a assuming this doesn't blow up the internet like the last fix - this is a very old bug that's been reported time and time again and nobody every bothered to debug or even report it somewhere where we could monitor it. It's buried somewhere in my stream, but basically is "things don't work right if you've got 'everybody in my address book' permissions" on "can send me their channel stream and posts". I think this is Michelle's problem and anybody else who has en empty matrix after making lots of connections. 2013-09-11 02:03:37 -07:00
friendica 5fbe4c1876 make comments work again 2013-09-10 23:25:56 -07:00
friendica 5e230edb85 well that really stuffed things up... 2013-09-10 22:45:04 -07:00
friendica de777d2f9c remove old debugging cruft 2013-09-10 21:17:33 -07:00