mirror of
https://github.com/friendica/friendica
synced 2024-11-10 05:02:58 +00:00
Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
108f2e1b81
11 changed files with 87 additions and 134 deletions
|
|
@ -643,7 +643,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
|||
|
||||
// fix any escaped ampersands that may have been converted into links
|
||||
$Text = preg_replace("/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
|
||||
$Text = preg_replace("/\<([^>]*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
|
||||
$Text = preg_replace("/\<([^>]*?)(src|href)=\"(?!http|ftp|mailto|cid)(.*?)\>/ism",'<$1$2="">',$Text);
|
||||
|
||||
if($saved_image)
|
||||
$Text = bb_replace_images($Text, $saved_image);
|
||||
|
|
|
|||
|
|
@ -214,11 +214,10 @@ function notification($params) {
|
|||
}
|
||||
|
||||
if($params['type'] == NOTIFY_CONFIRM) {
|
||||
|
||||
}
|
||||
|
||||
if($params['type'] == NOTIFY_SYSTEM) {
|
||||
|
||||
|
||||
}
|
||||
|
||||
$h = array(
|
||||
|
|
|
|||
|
|
@ -1149,7 +1149,6 @@ function item_store($arr,$force_parent = false) {
|
|||
$arr['deny_gid'] = $deny_gid;
|
||||
$arr['private'] = $private;
|
||||
$arr['deleted'] = $parent_deleted;
|
||||
call_hooks('post_remote_end',$arr);
|
||||
|
||||
// update the commented timestamp on the parent
|
||||
|
||||
|
|
@ -1195,6 +1194,14 @@ function item_store($arr,$force_parent = false) {
|
|||
logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
|
||||
}
|
||||
|
||||
$r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
|
||||
if (count($r) == 1) {
|
||||
call_hooks('post_remote_end', $r[0]);
|
||||
}
|
||||
else {
|
||||
logger('item_store: new item not found in DB, id ' . $current_post);
|
||||
}
|
||||
|
||||
return $current_post;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,6 +90,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
|
|||
$items = array_reverse($conv_as->items);
|
||||
|
||||
foreach ($items as $single_conv) {
|
||||
if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
|
||||
$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
|
||||
|
||||
if (@!$single_conv->id)
|
||||
continue;
|
||||
|
||||
if ($first_id == "") {
|
||||
$first_id = $single_conv->id;
|
||||
|
||||
|
|
|
|||
|
|
@ -183,6 +183,10 @@ if(strlen($a->module)) {
|
|||
*
|
||||
*/
|
||||
|
||||
// Compatibility with the Android Diaspora client
|
||||
if ($a->module == "stream")
|
||||
$a->module = "network";
|
||||
|
||||
if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
|
||||
include_once("addon/{$a->module}/{$a->module}.php");
|
||||
if(function_exists($a->module . '_module'))
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ function network_content(&$a, $update = 0) {
|
|||
if($update)
|
||||
killme();
|
||||
notice( t('No such group') . EOL );
|
||||
goaway($a->get_baseurl(true) . '/network');
|
||||
goaway($a->get_baseurl(true) . '/network/0');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
<img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
|
||||
<div class="login-form">
|
||||
<form action="$dest_url" method="post" >
|
||||
<input type="hidden" name="auth-params" value="login" />
|
||||
|
||||
<div id="login_standard">
|
||||
{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
|
||||
{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
|
||||
</div>
|
||||
|
||||
{{ if $openid }}
|
||||
<div id="login_openid">
|
||||
{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
<div id="login-submit-wrapper" >
|
||||
<input type="submit" name="submit" id="login-submit-button" value="$login" />
|
||||
</div>
|
||||
|
||||
<br /><br />
|
||||
<div class="login-extra-links">
|
||||
{{ if $register }}
|
||||
<a href="register" title="$register.title" id="register-link">$register.desc</a><br />
|
||||
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
{{ for $hiddens as $k=>$v }}
|
||||
<input type="hidden" name="$k" value="$v" />
|
||||
{{ endfor }}
|
||||
|
||||
|
||||
</form>
|
||||
</div>
|
||||
<script type="text/javascript">window.loginName = "$lname.0";</script>
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{{*
|
||||
* AUTOMATICALLY GENERATED TEMPLATE
|
||||
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
|
||||
*
|
||||
*}}
|
||||
<img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
|
||||
<div class="login-form">
|
||||
<form action="{{$dest_url}}" method="post" >
|
||||
<input type="hidden" name="auth-params" value="login" />
|
||||
|
||||
<div id="login_standard">
|
||||
{{include file="field_input.tpl" field=$lname}}
|
||||
{{include file="field_password.tpl" field=$lpassword}}
|
||||
</div>
|
||||
|
||||
{{if $openid}}
|
||||
<div id="login_openid">
|
||||
{{include file="field_openid.tpl" field=$lopenid}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div id="login-submit-wrapper" >
|
||||
<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
|
||||
</div>
|
||||
|
||||
<br /><br />
|
||||
<div class="login-extra-links">
|
||||
{{if $register}}
|
||||
<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a><br />
|
||||
<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{foreach $hiddens as $k=>$v}}
|
||||
<input type="hidden" name="{{$k}}" value="{{$v}}" />
|
||||
{{/foreach}}
|
||||
|
||||
|
||||
</form>
|
||||
</div>
|
||||
<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
style.css
|
||||
Smoothly
|
||||
|
||||
Created by alex@friendica.pixelbits.de on 2013-02-27
|
||||
Created by alex@friendica.pixelbits.de on 2013-03-12
|
||||
|
||||
** Colors **
|
||||
Blue links - #1873a2
|
||||
|
|
@ -197,25 +197,17 @@ section {
|
|||
}
|
||||
|
||||
#login-extra-links {
|
||||
width: 90px;
|
||||
width: auto;
|
||||
margin-top: 20px;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.login-extra-links {
|
||||
width: 100%;
|
||||
margin-left: 145px;
|
||||
margin-left: 0px;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#login-extra-links a {
|
||||
display: block;
|
||||
margin: 10px;
|
||||
padding: 5px 0px 5px 0px;
|
||||
text-align: center;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
#login-extra-filler {
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -231,9 +223,11 @@ section {
|
|||
margin: 10px 0 0 0;
|
||||
}
|
||||
|
||||
#login_openid {
|
||||
width: 300px;
|
||||
margin-left: 150px;
|
||||
#login_openid,
|
||||
#div_id_remember,
|
||||
#login-extra-links a {
|
||||
width: 460px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
#login_standard input,
|
||||
|
|
@ -243,9 +237,8 @@ section {
|
|||
|
||||
#register-link,
|
||||
#lost-password-link {
|
||||
font-size: 80%;
|
||||
width: 210px;
|
||||
margin-left: 5px;
|
||||
width: 260px;
|
||||
|
||||
}
|
||||
|
||||
#login-name-end,
|
||||
|
|
@ -257,8 +250,6 @@ section {
|
|||
|
||||
#login-submit-button,
|
||||
#login-submit-wrapper {
|
||||
margin-top: 10px;
|
||||
margin-left: 75px;
|
||||
}
|
||||
|
||||
#login-submit-button {
|
||||
|
|
@ -634,9 +625,8 @@ aside h4 {
|
|||
|
||||
.vcard #profile-photo-wrapper {
|
||||
margin: 10px 0px;
|
||||
padding: 1px;
|
||||
width: 200px;
|
||||
height: 200px;
|
||||
padding: 6px;
|
||||
width: auto;
|
||||
background: none repeat scroll 0 0 #FFFFFF;
|
||||
border: 1px solid #C5C5C5;
|
||||
box-shadow: 0 0 8px #BDBDBD;
|
||||
|
|
@ -1404,18 +1394,10 @@ ul .sidebar-group-li .icon {
|
|||
width: 100px;
|
||||
}
|
||||
|
||||
.wall-item-photo {
|
||||
width: 81px !important;
|
||||
height: 81px !important;
|
||||
border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
}
|
||||
|
||||
.wall-item-photo-wrapper {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
padding: 1px;
|
||||
padding: 4px;
|
||||
position: relative;
|
||||
border: 1px solid #dddddd;
|
||||
border-radius: 5px;
|
||||
|
|
@ -1598,13 +1580,14 @@ ul .sidebar-group-li .icon {
|
|||
}
|
||||
|
||||
.wallwall .wwto {
|
||||
left: 0px;
|
||||
left: -10px;
|
||||
margin: 0;
|
||||
position: absolute;
|
||||
margin: -1px;
|
||||
top: 63px;
|
||||
top: 65px;
|
||||
width: 30px;
|
||||
z-index: 900;
|
||||
width: 0px;
|
||||
height: 0px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
.wallwall .wwto img {
|
||||
|
|
@ -1618,8 +1601,8 @@ ul .sidebar-group-li .icon {
|
|||
|
||||
.wall-item-arrowphoto-wrapper {
|
||||
position: absolute;
|
||||
left: 30px;
|
||||
top: 67px;
|
||||
left: 20px;
|
||||
top: 70px;
|
||||
z-index: 950;
|
||||
}
|
||||
|
||||
|
|
@ -1733,8 +1716,8 @@ code {
|
|||
}
|
||||
|
||||
.wall-item-outside-wrapper.comment .wall-item-photo {
|
||||
width: 41px!important;
|
||||
height: 41px!important;
|
||||
width: 40px!important;
|
||||
height: 40px!important;
|
||||
}
|
||||
|
||||
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
|
||||
|
|
@ -2021,11 +2004,8 @@ div[id$="wrapper"] br {
|
|||
}
|
||||
|
||||
.photo {
|
||||
height: 200px!important;
|
||||
width: 200px!important;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
height: 191px!important;
|
||||
width: 191px!important;
|
||||
}
|
||||
|
||||
#side-bar-photos-albums {
|
||||
|
|
@ -4400,12 +4380,12 @@ div #datebrowse-sidebar.widget {
|
|||
|
||||
#settings-activity-desc,
|
||||
#settings-notify-desc {
|
||||
margin:10px 10px 10px 0;
|
||||
margin: 10px 10px 10px 0;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#settings-notifications {
|
||||
width: 400px;
|
||||
width: 410px;
|
||||
border: 1px solid #7C7D7B;
|
||||
box-shadow: 0 0 8px #BDBDBD;
|
||||
-moz-box-shadow: 3px 3px 4px #959494;
|
||||
|
|
@ -4413,8 +4393,8 @@ div #datebrowse-sidebar.widget {
|
|||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
padding:10px;
|
||||
margin:10px 10px 10px 0;
|
||||
padding: 10px;
|
||||
margin: 10px 10px 10px 0;
|
||||
}
|
||||
|
||||
#id_npassword {}
|
||||
|
|
@ -4493,3 +4473,9 @@ div #datebrowse-sidebar.widget {
|
|||
width: 75px;
|
||||
}
|
||||
|
||||
#id_remember {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.field.input.openid {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Smoothly
|
||||
* Description: Like coffee with milk. Theme optimized for iPad[2].
|
||||
* Version: Version 2013-02-27.1
|
||||
* Version: Version 2013-03-12.1
|
||||
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||
|
|
|
|||
|
|
@ -240,6 +240,11 @@ div.pager {
|
|||
|
||||
.shared_header a {
|
||||
color: black;
|
||||
-webkit-transition: all 0.2s ease-in-out;
|
||||
-moz-transition: all 0.2s ease-in-out;
|
||||
-o-transition: all 0.2s ease-in-out;
|
||||
-ms-transition: all 0.2s ease-in-out;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.shared_header a:hover {
|
||||
|
|
@ -291,7 +296,7 @@ body {
|
|||
background-color: #F2F2F2;
|
||||
color: #2d2d2d;
|
||||
/* margin: 37px 0px 0px 0px; */
|
||||
margin: 32px 0px 0px 0px;
|
||||
margin: 0px 0px 0px 0px;
|
||||
display: table;
|
||||
/* width: 100% */
|
||||
}
|
||||
|
|
@ -849,6 +854,7 @@ ul.menu-popup .empty {
|
|||
|
||||
right_aside {
|
||||
width: 0px;
|
||||
top: 32px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
|
@ -857,12 +863,20 @@ aside {
|
|||
/* display: table-cell; */
|
||||
vertical-align: top;
|
||||
width: 185px;
|
||||
padding: 10px 10px 10px 20px;
|
||||
padding: 32px 10px 10px 20px;
|
||||
/* border-right: 1px solid #D2D2D2; */
|
||||
/* background-color: #ECECF2; */
|
||||
background-color: #F2F2F2;
|
||||
font-size: 13px;
|
||||
/* background: #F1F1F1; */
|
||||
top: 0px;
|
||||
overflow-y: auto;
|
||||
z-index: 2;
|
||||
|
||||
position: fixed;
|
||||
/* overflow: auto; */
|
||||
height: 100%;
|
||||
/* overflow: scroll; */
|
||||
}
|
||||
aside .vcard .fn {
|
||||
font-size: 18px;
|
||||
|
|
@ -1062,6 +1076,7 @@ aside h4 {
|
|||
section {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
top: 32px;
|
||||
width: 766px;
|
||||
max-width: 766px;
|
||||
padding: 10px 10px 10px 10px;
|
||||
|
|
@ -1069,6 +1084,9 @@ section {
|
|||
border-bottom: 1px solid lightgray;
|
||||
border-right: 1px solid lightgray;
|
||||
border-left: 1px solid lightgray;
|
||||
|
||||
position: absolute;
|
||||
left: 215px;
|
||||
}
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
|
|
@ -1197,6 +1215,11 @@ border-bottom: 1px solid #D2D2D2;
|
|||
.wall-item-container .wall-item-name {
|
||||
color: black;
|
||||
font-weight: bold;
|
||||
-webkit-transition: all 0.2s ease-in-out;
|
||||
-moz-transition: all 0.2s ease-in-out;
|
||||
-o-transition: all 0.2s ease-in-out;
|
||||
-ms-transition: all 0.2s ease-in-out;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.toplevel_item:hover .wall-item-name,
|
||||
|
|
@ -1214,6 +1237,11 @@ border-bottom: 1px solid #D2D2D2;
|
|||
.toplevel_item .fakelink,
|
||||
.wall-item-container .fakelink {
|
||||
color: black;
|
||||
-webkit-transition: all 0.2s ease-in-out;
|
||||
-moz-transition: all 0.2s ease-in-out;
|
||||
-o-transition: all 0.2s ease-in-out;
|
||||
-ms-transition: all 0.2s ease-in-out;
|
||||
transition: all 0.2s ease-in-out;
|
||||
/* color: darkblue; */
|
||||
/* color: #3E3E8C; */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue