bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #646 from annando/master

Browse source 
OStatus conversations, "vier" and diaspora android client
This commit is contained in:
fermionic 2013-03-10 15:24:27 -07:00
commit 91a6a1cb25
4 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/enotify.php
View file

@ -214,7 +214,6 @@ function notification($params) {
}
if($params['type'] == NOTIFY_CONFIRM) {
}
if($params['type'] == NOTIFY_SYSTEM) {

6
include/ostatus_conversation.php
View file

@ -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;

4
index.php
View file

@ -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'))

32
view/theme/vier/style.css
View file

@ -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; */
}