aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* more optimisations for discovery mode of zotfeedfriendica2014-04-171-2/+6
|
* improve zotfeed for discover channel so it will send updates to posts you've ↵friendica2014-04-172-15/+13
| | | | already received. Incidentally I discovered why we had the meltdown replying to discover channel items the other day - but can't fix it easily.
* tag anyonefriendica2014-04-151-17/+3
|
* better mapping of visible connectionsfriendica2014-04-141-8/+6
|
* Better handling of restricted /channel and /profile permissions. We will ↵friendica2014-04-142-17/+25
| | | | show the name, profile photo and a 'connect' button if appropriate on these pages regardless of permissions. A blank page makes it difficult for folks to figure out how to connect and if it is their real life friend 'x' or not. It also matches our overall policy (adopted from Facebook's lessons learned) that the channel name and default profile photo are always visible and can't really be blocked without messing up the usability of the entire network. This also makes sure that a connect button can be found somewhere besides the directory - where the entry could be blocked; and avoid somebody having to figure out the webbie and find the link to "follow" (another related issue).
* until we can figure out how to allow commenting on the discover page without ↵friendica2014-04-131-0/+7
| | | | killing the matrix, just turn it off.
* Often somebody will join the matrix with a dodgy cert and we'll sort that ↵friendica2014-04-132-12/+26
| | | | out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
* remove extra tag loggingfriendica2014-04-121-1/+1
|
* don't match quote remnantsfriendica2014-04-121-1/+5
|
* let normal hashtags be quoted strings alsofriendica2014-04-121-1/+12
|
* Merge branch 'master' into prvtagfriendica2014-04-121-13/+13
|\
| * Ooops, replaced too manyThomas Willingham2014-04-121-2/+2
| |
| * Revert to prepare_text, use bbcode only for withThomas Willingham2014-04-121-15/+15
| |
* | no this is the way to do itfriendica2014-04-111-2/+2
| |
* | Use @+ to tag a forum and also restrict the post to the forum, this leaves ↵friendica2014-04-111-2/+2
|/ | | | @! tags private - period.
* make sure we can find that functionfriendica2014-04-111-0/+1
|
* we also need a loop breakerfriendica2014-04-111-0/+6
|
* Merge pull request #405 from beardy-unixer/masterRedMatrix2014-04-122-17/+18
|\ | | | | A few little fixes
| * Don't count deleted channels when figuring out where to send a user on login.Thomas Willingham2014-04-111-2/+3
| |
| * Bring BBCode to profilesThomas Willingham2014-04-111-15/+15
| |
* | Merge pull request #404 from git-marijus/masterRedMatrix2014-04-122-3/+9
|\ \ | | | | | | bootstrapify aclselector
| * | bootstrapify aclselectormarijus2014-04-112-3/+9
| |/
* / soft revert 9bb7811 until we can look at it more closely.friendica2014-04-111-4/+5
|/
* add the message-id to delivery reports. This _could_ allow an enterprising ↵friendica2014-04-101-14/+14
| | | | 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).
* Discover page: when importing public items, alter the item so that it has ↵friendica2014-04-101-0/+19
| | | | 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.
* move the deleted flag setting to encode_item_flags() where it belongs now ↵friendica2014-04-101-4/+3
| | | | that we aren't giving deleted posts special treatment.
* Include the entire original item when notifying other channels of deletions ↵friendica2014-04-102-6/+1
| | | | 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.
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-091-4/+3
|\
| * Merge pull request #399 from git-marijus/masterRedMatrix2014-04-101-4/+3
| |\ | | | | | | change the way jot tools are displayed/hidden
| | * use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵marijus2014-04-091-2/+1
| | | | | | | | | | | | editblock and editlayout which still depended on it.
| | * change the way jot tools are displayed/hiddenmarijus2014-04-081-2/+2
| | |
* | | issue #400 - lock not showing up for previews of private mentions (or ↵friendica2014-04-091-1/+5
|/ / | | | | | | | | | | 'new/search' item view) also reformat the new/search template to pick up recent changes to conv_item.tpl
* / 'anybody in this network' permissions were not being allowed for ↵friendica2014-04-091-6/+22
|/ | | | non-connected channels.
* some fixes to #395friendica2014-04-072-2/+2
|
* convert /network saved search to bootstrap buttonsfriendica2014-04-071-2/+2
|
* this should be better - "xchan deleted" state on remote sites only follows ↵friendica2014-04-071-9/+6
| | | | 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.
* undo one of yesterday's changes - if a channel was deleted we want to mark ↵friendica2014-04-071-6/+6
| | | | 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.
* prevent follows of and notifications to deceased channelsfriendica2014-04-073-2/+18
|
* check_webbie (webbie validator) returning bad webbiesfriendica2014-04-061-2/+4
|
* a bit more work towards issue #395 - cleaning up some cases which were going ↵friendica2014-04-061-9/+3
| | | | 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.
* jot and location style fixesmarijus2014-04-061-1/+1
|
* Merge pull request #397 from sasiflo/masterRedMatrix2014-04-061-1/+1
|\ | | | | Try to repair of channel administration
| * Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-8/+9
| |\
| * \ Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-1/+1
| |\ \
| * | | Hope I have repaired the channel admin page.sasiflo2014-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | issue #395, item 2friendica2014-04-062-3/+9
| |_|/ |/| |
* | | use parent_mid in the parent query for enotify instead of of the parent id. ↵friendica2014-04-061-8/+9
| |/ |/| | | | | 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.
* | Typo in externals SQL.Thomas Willingham2014-04-051-1/+1
|/
* provide the ability for rpost to post as another of your channels. This does ↵friendica2014-04-052-0/+30
| | | | not yet work, so the functionality has not been enabled.
* finish "ifpending" connectionsfriendica2014-04-041-1/+1
|