8246 Commits

Author SHA1 Message Date
RedMatrix df7c2afc68 Merge pull request #405 from beardy-unixer/master
A few little fixes
2014-04-12 07:20:44 +10:00
RedMatrix aa1f5ce753 Merge pull request #404 from git-marijus/master
bootstrapify aclselector
2014-04-12 07:20:24 +10:00
friendica e10509e2bd soft revert 9bb7811 until we can look at it more closely. 2014-04-11 14:01:33 -07:00
Thomas Willingham 81b06754a4 Don't count deleted channels when figuring out where to send a user on login. 2014-04-11 15:11:22 +01:00
marijus 3197ccbf5e bootstrapify aclselector 2014-04-11 16:06:39 +02:00
Thomas Willingham 4582b8dd64 Bring BBCode to profiles 2014-04-11 14:54:07 +01:00
friendica e64ec31a9d add the message-id to delivery reports. This _could_ allow an enterprising developer to collect the delivery reports for a given post and store them in a DB table so that the sender could track and verify where a message had been sent on a web page and verify the success or failure of those attempts without requiring admin access. (To be fair this would also need an extra flag which hasn't yet been implemented to indicate that a channel created a second delivery chain of the message). 2014-04-10 22:17:35 -07:00
friendica 9bb7811d74 Discover page: when importing public items, alter the item so that it has the characteristics of one that was sourced by the sys channel instead of just being stored under the sys channel uid. This should allow comments and likes to flow upstream if permissions allow and may fix issue #398. Permission may still be denied by the original poster, but without this the comment/like is treated as a forgery and is blocked from transmission. 2014-04-10 18:06:09 -07:00
friendica a49069db4e move the deleted flag setting to encode_item_flags() where it belongs now that we aren't giving deleted posts special treatment. 2014-04-10 16:26:27 -07:00
friendica bf1f18e172 Include the entire original item when notifying other channels of deletions as it contains important routing and scope information. Previously we were only sending a couple of critical fields like the message-id, flags, and creation date. The thinking was that it is deleted, let's not resend the deleted contents anywhere. But in order to route this through the same path the original post took we really need the entire original post with all of its baggage attached. 2014-04-10 16:14:19 -07:00
friendica 8d8d739242 Merge https://github.com/friendica/red into pending_merge 2014-04-09 21:13:40 -07:00
friendica 795d741713 issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view)
also reformat the new/search template to pick up recent changes to conv_item.tpl
2014-04-09 21:11:49 -07:00
RedMatrix 5d5ff22b1d Merge pull request #399 from git-marijus/master
change the way jot tools are displayed/hidden
2014-04-10 13:54:34 +10:00
friendica bf41ccbf35 'anybody in this network' permissions were not being allowed for non-connected channels. 2014-04-09 16:30:03 -07:00
marijus b88a7fc23a use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it. 2014-04-09 18:29:22 +02:00
marijus 9f621dac85 change the way jot tools are displayed/hidden 2014-04-08 22:07:06 +02:00
friendica 95751dddff some fixes to #395 2014-04-07 20:20:28 -07:00
friendica 03753f463e convert /network saved search to bootstrap buttons 2014-04-07 16:25:35 -07:00
friendica 74029a9ee9 this should be better - "xchan deleted" state on remote sites only follows the xchan_flags and not the channel_pageflags; XCHAN_FLAGS_DELETED should only be set if the channel is to be removed from the entire network. As mentioned in a previous commit, channel_pageflags could be set to PAGE_REMOVED but still leave living clones on other sites. 2014-04-07 16:10:43 -07:00
friendica 7e160a7b04 undo one of yesterday's changes - if a channel was deleted we want to mark the hubloc deleted - but not the xchan. The channel might be alive at another hubloc. We should only mark the xchan deleted when removing a channel from the entire network - e.g. there are no hubs left to service it. 2014-04-07 13:13:00 -07:00
friendica 10167fdf51 prevent follows of and notifications to deceased channels 2014-04-07 02:55:00 -07:00
friendica 28b7eedc45 check_webbie (webbie validator) returning bad webbies 2014-04-06 19:59:00 -07:00
friendica 6f555c50e1 a bit more work towards issue #395 - cleaning up some cases which were going to the url directly and which weren't going through chanview. Also worth noting - mentions in posts do not go through chanview. Perhaps it is time to kill chanview (except we then cannot implemented a "connected" or "connect" button since we don't have any control over the landing page). For the time being I'm just trying to trap as many of the "visit URL" links as possible and sending them to a common place. Then we can figure out how that common place should behave. 2014-04-06 18:40:37 -07:00
marijus f7cb4e0ef0 jot and location style fixes 2014-04-06 21:14:24 +02:00
RedMatrix 2a13a9b20a Merge pull request #397 from sasiflo/master
Try to repair of channel administration
2014-04-06 20:54:37 +10:00
friendica 64dfe3ab64 issue #395, item 2 2014-04-06 03:47:53 -07:00
sasiflo 6d170b2e07 Merge remote-tracking branch 'upstream/master' 2014-04-06 12:21:24 +02:00
friendica ad60e2c566 use parent_mid in the parent query for enotify instead of of the parent id. This should fix the issue with encrypted content in the notification messages (for locally posted replies). The fix was a bit harder than anticipated because we store the parent id as an int in the notify table so this had to be modified to char storage as well. 2014-04-06 02:57:33 -07:00
sasiflo d084d5575c Merge remote-tracking branch 'upstream/master' 2014-04-06 00:35:30 +02:00
sasiflo 9f54a8f96b Hope I have repaired the channel admin page.
Channel blocking and deleting was copied from user actions. This was not
done to an end. Hope what I do is enough to enable channel blocking and
deleting the correct way.

On deletion all entities that belong to the channel are deleted. But the
channel itself is just marked as deleted. Do not really understand why
it is done this way.
2014-04-06 00:34:52 +02:00
Thomas Willingham a2b949f339 Typo in externals SQL. 2014-04-05 22:55:38 +01:00
friendica 4901ef8faf provide the ability for rpost to post as another of your channels. This does not yet work, so the functionality has not been enabled. 2014-04-05 02:32:07 -07:00
friendica 32e71cf06b finish "ifpending" connections 2014-04-04 17:43:44 -07:00
friendica 97f0424b18 introduce a connection type called 'ifpending' for number 6 of issue #395 - so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu 2014-04-04 16:56:49 -07:00
friendica d68b202cad start of legacy probe utility 2014-04-02 16:26:39 -07:00
friendica 27fec9cb64 more efficient public feed fetching 2014-04-02 15:13:50 -07:00
Thomas Willingham f4dd8657cb Let admins set a default expire days value. 2014-04-01 19:36:56 +01:00
friendica 78d7425a1d wrong var name in add_source_route 2014-03-31 17:21:16 -07:00
friendica 8ffdccb99f crank up logging 2014-03-31 17:14:56 -07:00
friendica 93f90040a1 community tags don't show up in the tagged posts because we removed the displayed list of hashtags at the bottom (which are usually redundant since hashtags are usually present in the message text). This brings them back, but only for tags which aren't currently present in the message body (e.g. community tags) 2014-03-31 17:03:07 -07:00
friendica 03c53502cb Merge branch 'route' 2014-03-31 16:30:04 -07:00
friendica 421df717fe doco 2014-03-31 16:29:46 -07:00
friendica ced6d82633 finish up the source route storage so we can prevent messages from flowing upstream in complicated delivery chains 2014-03-31 16:25:05 -07:00
friendica 57a9ba4574 this is a mess and makes a complicated security model that one can probably drive a truck through. It will have to be fixed. It does make youtubes work again. 2014-03-31 15:56:58 -07:00
friendica 04d9187c7a photo timestamp was missing from main profile photo url which prevents photo changes from being immediately seen there. 2014-03-31 15:04:56 -07:00
friendica 653d7df86d issue #378, failure to correctly link tags where one tag contains a substring of the other (depends on the order they are discovered). 2014-03-30 20:53:59 -07:00
RedMatrix 8efef6f98b Merge pull request #387 from beardy-unixer/master
Default discover to on
2014-03-31 09:22:00 +11:00
friendica b00478d3b5 revise the sandbox 2014-03-30 15:01:51 -07:00
Thomas Willingham 1093e8d83e Default discover to on. 2014-03-30 22:59:37 +01:00
friendica 9e5f424394 typo 2014-03-29 23:45:21 -07:00