aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* introduce a connection type called 'ifpending' for number 6 of issue #395 - ↵friendica2014-04-041-1/+1
| | | | so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu
* start of legacy probe utilityfriendica2014-04-021-0/+99
|
* more efficient public feed fetchingfriendica2014-04-021-6/+17
|
* Let admins set a default expire days value.Thomas Willingham2014-04-011-3/+7
|
* wrong var name in add_source_routefriendica2014-03-311-2/+2
|
* crank up loggingfriendica2014-03-311-0/+2
|
* community tags don't show up in the tagged posts because we removed the ↵friendica2014-03-312-0/+31
| | | | 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)
* Merge branch 'route'friendica2014-03-312-1/+36
|\
| * docofriendica2014-03-311-0/+5
| |
| * finish up the source route storage so we can prevent messages from flowing ↵friendica2014-03-311-17/+10
| | | | | | | | upstream in complicated delivery chains
| * source routing stufffriendica2014-03-292-0/+37
| |
* | this is a mess and makes a complicated security model that one can probably ↵friendica2014-03-312-5/+7
| | | | | | | | drive a truck through. It will have to be fixed. It does make youtubes work again.
* | photo timestamp was missing from main profile photo url which prevents photo ↵friendica2014-03-311-0/+8
| | | | | | | | changes from being immediately seen there.
* | issue #378, failure to correctly link tags where one tag contains a ↵friendica2014-03-302-1/+18
| | | | | | | | substring of the other (depends on the order they are discovered).
* | Merge pull request #387 from beardy-unixer/masterRedMatrix2014-03-312-2/+2
|\ \ | | | | | | Default discover to on
| * | Default discover to on.Thomas Willingham2014-03-302-2/+2
| | |
* | | revise the sandboxfriendica2014-03-302-2/+2
|/ /
* | typofriendica2014-03-291-1/+1
| |
* | issue #384friendica2014-03-291-28/+35
|/
* Let the site admin choose whether to display the Discover tab.Alexandre Hannud Abdo2014-03-302-11/+13
|
* externals/discover: try up to 3 times to find a site that actually has ↵friendica2014-03-281-36/+41
| | | | content. Then give up until the next queue run.
* external -> discoverfriendica2014-03-281-1/+1
|
* don't include standalone test sites in external host listfriendica2014-03-271-2/+3
|
* try and sort out the item delete messfriendica2014-03-273-19/+68
|
* this should work a bit betterfriendica2014-03-271-3/+6
|
* Merge https://github.com/friendica/red into zpullfriendica2014-03-271-1/+1
|\
| * typoThomas Willingham2014-03-281-1/+1
| |