Commit Graph

4046 Commits

Author SHA1 Message Date
friendica
c6e86ae0d9 Merge https://github.com/friendica/red into pending_merge 2014-10-06 21:38:15 -07:00
friendica
ac77076135 Make a best guess at how to pull the attribution from the recursive reshare from hell. 2014-10-06 21:37:02 -07:00
RedMatrix
ae915df0a5 Merge pull request #620 from dawnbreak/RedDAV
Moved RedBrowser class from reddav.php to it's own file.
2014-10-07 15:17:19 +11:00
friendica
bbf88cf639 found one bug trying to fetch the recursive reshare from hell. I still think there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing. 2014-10-06 20:54:52 -07:00
friendica
03585b8f88 SQL error - private message conversation lookup 2014-10-06 19:37:51 -07:00
friendica
03bbbdaf10 shareable design elements 2014-10-06 17:47:17 -07:00
Klaus Weidenbach
33394f58ff Moved RedBrowser class from reddav.php to it's own file.
First step on cleaning up ReadDAV classes and restructuring it bit in
preparation for adding some more DAV features, photo access, CalDAV, etc.
and hopefully also some PHPunits.
Add a PHP5.3 namespace for RedDAV classes. Any objections against this or
the vendor namespace?
Add some more documentation for RedBrowser.
2014-10-06 23:38:33 +02:00
friendica
34ef3fda76 attempt to deal with the diaspora recursive reshare from hell (Bob reshared Nancy's reshare of George's reshare of Lilly's reshare of Nathan's post). The attribution may be wrong so this is still a work in progress. 2014-10-05 22:17:51 -07:00
friendica
2cadc5a840 send dislike activities to diaspora as comments, also send likes and dislikes of comments as additional comments. We won't go into why this is necessary for a service that claims to support activitystreams. 2014-10-05 17:27:52 -07:00
friendica
bf6c72fc0e Merge https://github.com/friendica/red into pending_merge 2014-10-05 15:42:25 -07:00
friendica
d4a6a6b4f5 diaspora share not rendering issue - still have one remaining (the recursive share from hell) 2014-10-05 15:41:03 -07:00
RedMatrix
7bad7e505a Merge pull request #616 from dawnbreak/docu
Documentation and some restructure in RedBasicAuth
2014-10-06 09:02:21 +11:00
Jeroen
a17eae941b image/jpeg > image/png 2014-10-05 21:38:47 +00:00
Jeroen
ae9b0c0e1b Changed default avatars to PNG as agreed with Mike here: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl. Added a few new. You can set it like this: util/config system default_profile_photo red_avatar 2014-10-05 18:32:28 +00:00
Klaus Weidenbach
305498eb16 Some documentation for include/reddav.php and a bit code cleanup.
Removed some duplicate code in RedBasicAuth and restructured a bit.
Still work in progress.
2014-10-05 15:24:16 +02:00
Klaus Weidenbach
0875448ab9 Some documentation of include/auth.php. 2014-10-05 14:51:58 +02:00
friendica
9135ad30d8 network page default option 2014-10-04 23:53:05 -07:00
Thomas Willingham
557894bc01 That's a string, not an integer 2014-10-03 15:16:05 +01:00
Thomas Willingham
09e0b4e2a1 Set timezone when creating a channel. 2014-10-03 00:57:07 +01:00
RedMatrix
a932c20dc4 Merge pull request #610 from tuscanhobbit/dev
site language wasn't included in siteinfo/json
2014-10-02 23:05:59 +10:00
Paolo Tacconi
15c1529e83 query for statistics are now executed by poller 2014-10-02 13:43:48 +02:00
friendica
16b94f1dc0 issues with diaspora comment signatures on relayed comments that are relayed through a redmatrix site (parent post is redmatrix) and involve a private post. 2014-10-02 02:43:07 -07:00
friendica
baa0b0f393 only auto-follow the site recommendations if creating the first channel for an account. 2014-10-01 15:40:19 -07:00
friendica
467c6c72f0 ability to pre-populate connections for new channels. e.g. "MySpace Tom" 2014-10-01 14:48:08 -07:00
friendica
f19d718631 that's why remove_obsolete_hublocs() isn't telling anybody when it does its thing, I forgot to uncomment the bit that tells everybody after I tested it. I needed extensive testing to make sure we didn't accidentally wipe out all hublocs everywhere. Testing went fine so I just assumed it was all working as planned; but went back today to find out why I wasn't told of a recent change. 2014-09-30 23:41:50 -07:00
friendica
79f1d48e19 Merge https://github.com/friendica/red into pending_merge 2014-09-30 21:31:31 -07:00
friendica
cb44d015f3 allow site specific templates, css, js, whatever 2014-09-30 21:30:27 -07:00
RedMatrix
e12872fdae Merge pull request #608 from beardy-unixer/master
Pluggable page templates
2014-10-01 14:11:16 +10:00
friendica
f8468b4c3a allow custom role permissions and fix site timezone. 2014-09-29 23:36:41 -07:00
friendica
5292e3a100 implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it. 2014-09-29 21:58:35 -07:00
habeascodice
e62a95aaba regex missing terminator char 2014-09-29 15:41:47 -07:00
Thomas Willingham
7c3b428e67 Merge branch 'master' of https://github.com/friendica/red 2014-09-29 19:12:12 +01:00
Thomas Willingham
90378e8ef8 Silence insanely noisy log - should probably stick this in a dlogger
if we need it - we're getting literally hundreds of thousands of these.
2014-09-29 19:06:43 +01:00
Thomas Willingham
9de5b6b905 Pluggable page templates 2014-09-29 15:13:39 +01:00
habeascodice
73ebdff083 Merge remote branch 'upstream/master' 2014-09-28 19:31:19 -07:00
habeascodice
c0b59ae36a Typo in regex causes runtime error 2014-09-28 19:30:47 -07:00
Thomas Willingham
ffe6d20dc0 BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does. 2014-09-28 03:20:49 +01:00
friendica
2b02f611ad Merge https://github.com/friendica/red into pending_merge 2014-09-27 05:11:32 -07:00
friendica
51c0904a8a Merge https://github.com/friendica/red into pending_merge 2014-09-27 00:15:43 -07:00
friendica
fa019791fa some background work for import/export of things and liked things/profiles 2014-09-27 00:14:35 -07:00
Klaus Weidenbach
2681071970 Some documentation of include/config.php.
I hope my guesses are not completely wrong, anyway please take look
not that I tell complete bullshit.
2014-09-26 22:28:35 +02:00
Thomas Willingham
94fcf5885e So much so, in fact, that I didn't even notice the typo. 2014-09-26 17:16:55 +01:00
Thomas Willingham
c9e8a3e8fe Minor doco. Add some clarity - that had me scratching my head. 2014-09-26 17:05:22 +01:00
friendica
d8c03526ed optionally include wall items (posts) in import/export 2014-09-25 20:21:23 -07:00
Thomas Willingham
e75f1ccb2e Typo 2014-09-25 19:47:06 +01:00
friendica
24d402941f if no rss/atom element author, use feed level contact 2014-09-24 14:27:18 -07:00
friendica
c76b8febaa make it the default 2014-09-24 02:18:13 -07:00
friendica
95470a9f9b one step closer 2014-09-24 02:08:35 -07:00
friendica
be54f0d9e6 more testing 2014-09-24 01:58:24 -07:00
friendica
87b8e2725c just an experiment - don't do anything with this until I'm finished with it. 2014-09-24 01:45:57 -07:00
friendica
81ee35e03b fix url mismatches of a single trailing slash for feed author/owner comparisons; update diaspora_compat 2014-09-23 20:55:22 -07:00
friendica
f203d2a3b0 diaspora private mail seems to work now - but there's an obfuscation leak via the conversation structure that needs to be dealt with. 2014-09-23 20:36:10 -07:00
friendica
2b466ccb8c d* little fixes 2014-09-23 04:40:36 -07:00
friendica
ad86cc24c8 d* PM cont. 2014-09-23 04:34:35 -07:00
friendica
509a85cb12 more work on d* private messages 2014-09-23 03:03:14 -07:00
friendica
72ec78d027 trying to call mod/magic on rss resources - which have no hub 2014-09-22 23:49:12 -07:00
friendica
e8854bb19d better way to deal with effective_uid 2014-09-22 22:03:19 -07:00
friendica
fb05919d90 make discover items interactive 2014-09-22 21:37:19 -07:00
friendica
b735961560 found the sucker 2014-09-22 16:23:59 -07:00
friendica
2070dbfdea private mail from d* to r# seems to work with these edits. - Now have to go back the other way. 2014-09-22 02:27:52 -07:00
friendica
4aa1506c00 Merge https://github.com/friendica/red into pending_merge 2014-09-21 15:13:32 -07:00
friendica
e76ab30467 we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUBLOC_OFFLINE instead. Filter this as well from deliveries. 2014-09-21 15:11:47 -07:00
RedMatrix
aa928d65eb Merge pull request #600 from dawnbreak/master
Don't link unknown likes.
2014-09-22 07:50:20 +10:00
friendica
09b5bbb032 feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599 2014-09-21 14:46:12 -07:00
Klaus Weidenbach
d2268a412d Don't link unknown likes.
Likes/Dislikes of unknown channels have disabled links now.
Fixed intention a bit, romved a unused variable.
2014-09-21 17:51:01 +02:00
friendica
22e6e691ca Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". 2014-09-20 16:34:48 -07:00
friendica
44cb423f21 Merge https://github.com/friendica/red into pending_merge 2014-09-20 16:22:21 -07:00
friendica
8d23a8da8d fix empty likes 2014-09-20 16:21:49 -07:00
marijus
69a10e8ca7 oups... 2014-09-20 17:30:11 +02:00
marijus
6c806f6f48 aalso change the way we check for number of chatrooms 2014-09-20 17:28:42 +02:00
marijus
bd54358aa6 show bookmarks menu only if we have any bookmarks already 2014-09-20 16:31:56 +02:00
friendica
cb434818f8 closing tag 2014-09-19 16:50:43 -07:00
friendica
87a6f25769 try to sort out walltowall translation for diaspora recipients 2014-09-19 02:22:24 -07:00
Thomas Willingham
bdfe2c7786 Merge remote-tracking branch 'upstream/master' 2014-09-18 18:07:38 +01:00
friendica
c6062d7872 usability tweaks 2014-09-17 21:52:30 -07:00
friendica
51d9f0d97a channel permission roles 2014-09-17 21:16:15 -07:00
friendica
eca420ec96 defined several permission roles - these will probably require some review and adjustment.
social
social_restricted
social_private
forum
forum_restricted
forum_private
feed
feed_restricted
soapbox
2014-09-17 19:46:55 -07:00
friendica
4014093572 implement permission roles - the backend should be done except for maybe a couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. 2014-09-17 17:59:46 -07:00
friendica
0090cbf84b that's why bb2diaspora_itemwallwall() wasn't doing its thang. 2014-09-16 22:26:52 -07:00
friendica
19e8d10b7a still some old Friendica database queries in diaspora_signed_retraction 2014-09-16 21:08:34 -07:00
friendica
53d0e855df z_post_url_json() added to easily deal with JSON post APIs; without getting content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers. 2014-09-16 20:46:44 -07:00
friendica
c4608d4c82 just mark dead hubloc deleted - don't remove them. This could cause problems. Also clean up fetch_url/post_url header option 2014-09-16 19:07:19 -07:00
friendica
a1b66f56f0 use the more portable encoded_item format for exported items - but with added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this. 2014-09-16 03:33:48 -07:00
friendica
5f9c326ad7 channel export with items 2014-09-15 21:31:32 -07:00
friendica
bbc9e4427e honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped. 2014-09-15 17:17:00 -07:00
friendica
5ea6f27792 final piece of the mrjive delivery puzzle, and now we've got most all the tools to implement mod_hubman 2014-09-15 13:37:57 -07:00
Thomas Willingham
68ecc673b1 Merge remote-tracking branch 'upstream/master' 2014-09-15 17:10:11 +01:00
friendica
0dc33900b6 provide a way to sync locations and get rid of bogus hublocs, now implemented 2014-09-14 22:19:19 -07:00
Thomas Willingham
e3b967f475 Very, very cautiously let a developer switch to the sys chan if
they're also an administrator.
2014-09-15 03:59:04 +01:00
Thomas Willingham
b6612693b6 Bugger, revert - not only a dodgy cut and paste between terminals, but
also pushed to the wrong repo
2014-09-15 03:55:49 +01:00
Thomas Willingham
e3783dfdd4 Very, very cautiously, let a developer switch to the sys chan, if
they're also an admin.
2014-09-15 03:51:41 +01:00
friendica
f2b0311f9d that won't work... 2014-09-14 19:20:16 -07:00
friendica
b2fe2b067a bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode 2014-09-14 19:17:05 -07:00
friendica
5042847334 fix diaspora_retraction 2014-09-14 19:04:36 -07:00
friendica
bcc9057d8c pull the plug on the old location sync section of import_xchan - this has now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different.
Please revert this if the matrix breaks in the next few hours.
2014-09-14 18:09:16 -07:00
friendica
0a5f0fe10b Merge https://github.com/friendica/red into pending_merge 2014-09-14 17:11:50 -07:00
friendica
6be6b41a42 privacy issue - restrictive stream permission setting with a non-targetted post cannot be enforced on remote networks. Restrict these posts to zot network. 2014-09-14 17:07:39 -07:00
Jeroen
9b80667326 Thanks to Thomas other people see now your posts on your channel page also linked to source. If enabled. 2014-09-14 13:59:27 +00:00
Jeroen
254dc0ec98 Made link post titles to source optional in display settings. Hopefully I did a right. 2014-09-14 12:39:11 +00:00
friendica
c27b60d981 more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration. 2014-09-14 01:48:54 -07:00
friendica
0350b76d85 some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries. 2014-09-13 16:00:09 -07:00
friendica
b1809f5f0c log why this doesn't get executed 2014-09-12 15:10:53 -07:00
friendica
ab7f2db4d7 doc updates and a couple of issues spotted in the logs (diaspora likes, feed author import) 2014-09-12 00:59:23 -07:00
friendica
20be358ec2 bad redirects 2014-09-11 23:01:58 -07:00
friendica
6ec12c66c3 red group/collection query calls for api 2014-09-11 21:41:45 -07:00
friendica
e68185fc05 don't allow an xchan to be imported with an empty name. To avoid translation issues we'll just make it '-'. 2014-09-11 18:11:07 -07:00
friendica
3a10956b20 correct item author for feeds with multiple or different authors 2014-09-11 17:27:49 -07:00
friendica
5547222da2 add gif to supported image types (if it's supported) 2014-09-11 15:50:35 -07:00
friendica
1b3196862d issue #588 can't add feeds to collections using connedit page group sidebar widget 2014-09-11 02:19:21 -07:00
friendica
10f6f355d4 disabling ability for diaspora to plustag redmatrix forums. See the notes. 2014-09-10 22:35:09 -07:00
friendica
f1539a65e5 possible solution to diaspora walltowall mistaken attribution 2014-09-10 22:21:19 -07:00
friendica
de89bdc45f encrypt diaspora_meta since it may contain private message contents 2014-09-10 19:02:00 -07:00
friendica
79bd451631 fix the like signatures to the "new ordering" - inbound and outbound 2014-09-10 16:32:19 -07:00
friendica
d891b09b22 don't include plus-sign in the stored term for imported mentions 2014-09-10 01:27:52 -07:00
friendica
e45a9b1522 this should be the final piece of the puzzle 2014-09-09 23:23:52 -07:00
friendica
f09b7ca409 cross-network mention issues 2014-09-09 23:12:17 -07:00
friendica
cb10da3eef Did I ever mention how much I HATE hacking crypto? If you've got a protocol doc that says how you sign something, you damm well better sign it that way. 2014-09-09 22:45:26 -07:00
friendica
e7b005b1f8 go through the entire discovery sequence for mentions to make sure we have the correct URL 2014-09-09 22:33:23 -07:00
friendica
c1713d49e0 diaspora connections being marked orphan on directory servers 2014-09-09 21:54:25 -07:00
friendica
c02554ad36 some fixes for auto-perms across networks 2014-09-09 21:38:51 -07:00
friendica
89b65e554c reduce log level of inbound d* posts until we get through some of the more serious federation issues 2014-09-09 20:32:03 -07:00
friendica
5ede60e742 and provide a strong hint by showing the errant account_flags 2014-09-09 18:26:40 -07:00
friendica
c11fc95d97 in case somebody has problems and does an update to try and fix it, put something in the logs to show what's happening. 2014-09-09 18:23:50 -07:00
friendica
18f8f08367 argument order reversed in downgrade_accounts 2014-09-09 17:25:31 -07:00
friendica
537f101554 encode rss message-id's - warning this will double store all existing rss feed items and probably make a mess of things 2014-09-09 16:28:33 -07:00
friendica
f52e754dc6 put back old pointer 2014-09-09 15:53:58 -07:00
friendica
420fd59513 fix empty reshared content 2014-09-09 15:52:52 -07:00
friendica
409c89d629 doco correction 2014-09-09 04:10:01 -07:00
friendica
386156138f syntax error in dba driver, document z_post_url 2014-09-09 02:42:07 -07:00
friendica
9753453ec4 if we have php54 don't log the whole damn stack on a db error, just the current frame 2014-09-09 01:23:52 -07:00
friendica
4384fa8b12 d* friending vsprintf error 2014-09-09 01:14:15 -07:00
friendica
384eace32a heavy lifting on diaspora likes. Still needs much more work - especially as we're ignoring signatures at this time 2014-09-08 22:32:05 -07:00
friendica
e4e9098f39 prevent red#matrix smilie replacements from tripping over each other. 2014-09-08 21:36:33 -07:00
friendica
b7c1ad8cb2 diaspora_like - sql error 2014-09-08 21:08:50 -07:00
friendica
21290bffce one more time 2014-09-08 20:47:36 -07:00
friendica
b56e49d196 missed one 2014-09-08 20:45:17 -07:00
friendica
c6d07feff5 This is long overdue - use a symblic constant NULL_DATE instead of the easily mis-typed sequence '0000-00-00 00:00:00' 2014-09-08 20:35:15 -07:00
friendica
8fbeb370db attempt to format diaspora reshares correctly. This might be an iterative process. 2014-09-08 17:29:37 -07:00
friendica
715417c0e3 import_profile_photo array warnings 2014-09-08 16:06:15 -07:00
friendica
ed847a91f6 add categories to events 2014-09-07 22:14:28 -07:00
friendica
3cff9c55ba support the recent (2 years ago) changes to diaspora photo embeds 2014-09-06 15:11:56 -07:00
friendica
8cbeeb09da extra_query_args() restricted to $_GET only. $_REQUEST was adding cookies and this is undesired and potentially a security issue. 2014-09-06 03:11:07 -07:00
friendica
28b75b028d ajax work 2014-09-06 00:37:15 -07:00
friendica
7a9b1c4a77 illegal string offset warnings 2014-09-05 15:00:08 -07:00
friendica
01a5ac92a8 improved logging if you're using php54 or later 2014-09-04 23:13:46 -07:00
friendica
4875473c1b issue #451 - clear gid and cid from network tab if discover is selected 2014-09-04 22:41:02 -07:00
friendica
c7370df1cf bb2diaspora_itembody - empty body, that explains a lot 2014-09-04 21:27:13 -07:00
friendica
80f956a622 fix the client side of poco 2014-09-04 19:45:26 -07:00
friendica
1e5e70fcf4 import_author_rss not succeeding, missing url 2014-09-04 19:15:01 -07:00
friendica
955567fe5f unset item_nocomment when starting a new delivery chain 2014-09-04 18:52:37 -07:00