Merge https://github.com/redmatrix/hubzilla into pending_merge
This commit is contained in:
redmatrix
commit
65587be737
46
.travis.yml
Normal file
46
.travis.yml
Normal file
@ -0,0 +1,46 @@
|
||||
# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
|
||||
language: php
|
||||
|
||||
# list any PHP version you want to test against
|
||||
php:
|
||||
# using major version aliases
|
||||
|
||||
# aliased to a recent 5.4.x version
|
||||
- 5.4
|
||||
# aliased to a recent 5.5.x version
|
||||
- 5.5
|
||||
# aliased to a recent 5.6.x version
|
||||
- 5.6
|
||||
# aliased to a recent 7.x version
|
||||
- 7.0
|
||||
# aliased to a recent hhvm version
|
||||
- hhvm
|
||||
|
||||
# optionally specify a list of environments, for example to test different RDBMS
|
||||
#env:
|
||||
# - DB=mysql
|
||||
# - DB=pgsql
|
||||
|
||||
# optionally set up exclutions and allowed failures in the matrix
|
||||
matrix:
|
||||
# exclude:
|
||||
# - php: hhvm
|
||||
# env: DB=pgsql # PDO driver for pgsql is unsupported by HHVM (3rd party install for support)
|
||||
allow_failures:
|
||||
- php: 7.0
|
||||
- php: hhvm
|
||||
|
||||
# execute any number of scripts before the test run, custom env's are available as variables
|
||||
#before_script:
|
||||
# - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi
|
||||
# - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
|
||||
# - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
|
||||
|
||||
# omitting "script:" will default to phpunit
|
||||
# use the $DB env variable to determine the phpunit.xml to use
|
||||
script: phpunit tests/*php
|
||||
|
||||
# configure notifications (email, IRC, campfire etc)
|
||||
notifications:
|
||||
# irc: "irc.freenode.org#yourfavouriteroomfortravis"
|
||||
# a plugin/script to post to a hubzilla channel would be neat here
|
||||
@ -64,7 +64,10 @@ function z_mime_content_type($filename) {
|
||||
'wav' => 'audio/wav',
|
||||
'qt' => 'video/quicktime',
|
||||
'mov' => 'video/quicktime',
|
||||
'ogg' => 'application/ogg',
|
||||
'ogg' => 'audio/ogg',
|
||||
'ogv' => 'video/ogg',
|
||||
'ogx' => 'application/ogg',
|
||||
'flac' => 'audio/flac',
|
||||
'opus' => 'audio/ogg',
|
||||
'webm' => 'video/webm',
|
||||
// 'webm' => 'audio/webm',
|
||||
|
||||
@ -292,18 +292,19 @@ function photo_upload($channel, $observer, $args) {
|
||||
$tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
|
||||
}
|
||||
|
||||
$body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
|
||||
. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
|
||||
. '[/zrl]';
|
||||
|
||||
// Create item object
|
||||
$object = array(
|
||||
'type' => ACTIVITY_OBJ_PHOTO,
|
||||
'title' => $title,
|
||||
'id' => rawurlencode(z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash),
|
||||
'link' => $link
|
||||
'link' => $link,
|
||||
'bbcode' => $body
|
||||
);
|
||||
|
||||
$body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
|
||||
. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
|
||||
. '[/zrl]';
|
||||
|
||||
// Create item container
|
||||
if($args['item']) {
|
||||
foreach($args['item'] as $i) {
|
||||
|
||||
@ -42,6 +42,12 @@ function share_init(&$a) {
|
||||
|
||||
xchan_query($r);
|
||||
|
||||
$is_photo = (($r[0]['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
|
||||
if($is_photo) {
|
||||
$object = json_decode($r[0]['object'],true);
|
||||
$photo_bb = $object['bbcode'];
|
||||
}
|
||||
|
||||
if (strpos($r[0]['body'], "[/share]") !== false) {
|
||||
$pos = strpos($r[0]['body'], "[share");
|
||||
$o = substr($r[0]['body'], $pos);
|
||||
@ -53,9 +59,9 @@ function share_init(&$a) {
|
||||
"' posted='".$r[0]['created'].
|
||||
"' message_id='".$r[0]['mid']."']";
|
||||
if($r[0]['title'])
|
||||
$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
|
||||
$o .= $r[0]['body'];
|
||||
$o.= "[/share]";
|
||||
$o .= '[b]'.$r[0]['title'].'[/b]'."\r\n";
|
||||
$o .= (($is_photo) ? $photo_bb . "\r\n" . $r[0]['body'] : $r[0]['body']);
|
||||
$o .= "[/share]";
|
||||
}
|
||||
|
||||
if(local_channel()) {
|
||||
|
||||
@ -11,7 +11,7 @@ body {
|
||||
border: 1px solid #FFF;
|
||||
}
|
||||
|
||||
.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label {
|
||||
.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus {
|
||||
color: rgba(255,255,255,.8);
|
||||
}
|
||||
|
||||
@ -20,9 +20,18 @@ body {
|
||||
}
|
||||
|
||||
.generic-content-wrapper {
|
||||
background-color: rgba(255,255,255,.8);
|
||||
color: #4d4d4d;
|
||||
}
|
||||
|
||||
.wall-item-content-wrapper {
|
||||
background-color: #FFF;
|
||||
}
|
||||
|
||||
.hide-comments-outer, .wall-item-content-wrapper.comment, .wall-item-comment-wrapper {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.generic-content-wrapper-styled .generic-content-wrapper {
|
||||
color: #4d4d4d;
|
||||
}
|
||||
@ -76,7 +85,7 @@ input#jot-title:hover, input#jot-title:focus {
|
||||
}
|
||||
|
||||
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu {
|
||||
background-color: rgba(67,72,138,.95);
|
||||
background-color: rgba(67,72,138,.97);
|
||||
color: #fff;
|
||||
border-radius: 0;
|
||||
border: none;
|
||||
@ -89,6 +98,23 @@ nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dro
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.vcard .dropdown-menu {
|
||||
background-color: rgba(255,255,255,.97);
|
||||
border-radius: 0;
|
||||
border: none;
|
||||
box-shadow: 0px 6px 12px rgba(169,169,169,.176);
|
||||
}
|
||||
|
||||
.vcard .dropdown-menu a, .fc-today {
|
||||
color: #43488A;
|
||||
}
|
||||
|
||||
.vcard .dropdown-menu > li > a:focus, .vcard .dropdown-menu > li > a:hover {
|
||||
color: #43488A;
|
||||
background-color: rgba( 255,255,255,.7);
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
nav .badge {
|
||||
background-color: rgba(255,255,255,.8);
|
||||
color: #43488A;
|
||||
@ -173,10 +199,6 @@ nav .badge:hover, nav .badge:focus {
|
||||
text-shadow: none !important;
|
||||
}
|
||||
|
||||
.fc-today {
|
||||
color: #43488A;
|
||||
}
|
||||
|
||||
div.rateme {
|
||||
border-radius: 0px;
|
||||
font-weight: 400;
|
||||
@ -197,8 +219,12 @@ div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus {
|
||||
color: #43488A !important;
|
||||
}
|
||||
|
||||
.notice {
|
||||
background: rgba(215,43,52,.7) url("/images/hz-white-32.png") no-repeat scroll 15px center !important;
|
||||
color: #FFF !important;
|
||||
}
|
||||
|
||||
input {
|
||||
-moz-border-radius: 0px;
|
||||
border-radius: 0px;
|
||||
}
|
||||
|
||||
@ -211,9 +237,18 @@ input {
|
||||
border: 1px solid rgba(255,255,255,.5);
|
||||
}
|
||||
|
||||
.contact-entry-edit a:hover, .contact-entry-edit a:focus {
|
||||
.contact-entry-edit a:hover, .contact-entry-edit a:focus, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus {
|
||||
color: #43488A;
|
||||
}
|
||||
}
|
||||
|
||||
.profile-edit-side-link, input#profile-photo-upload, .allcontact-link {
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
.profile-edit-side-link:hover, .profile-edit-side-link:focus {
|
||||
color: #FFF;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.btn, #event-edit-form .btn {
|
||||
border: 1px solid #FFF;
|
||||
@ -252,7 +287,7 @@ input {
|
||||
border-color: #398439;
|
||||
}
|
||||
|
||||
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit {
|
||||
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit {
|
||||
background-color: #FFF;
|
||||
color: #43488A;
|
||||
border-radius: 0px;
|
||||
@ -261,7 +296,7 @@ input {
|
||||
transition: all .3s ease-in-out;
|
||||
}
|
||||
|
||||
.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus {
|
||||
.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus {
|
||||
border-color: #FFF;
|
||||
background-color: #43488A;
|
||||
color: #FFF;
|
||||
|
||||
@ -1 +1,3 @@
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h1>{{$message}}</h1>
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h1>{{$room_name}}</h1>
|
||||
<div id="chatContainer">
|
||||
|
||||
@ -33,6 +34,7 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
var room_id = {{$room_id}};
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h1>{{$header}}</h1>
|
||||
|
||||
<form action="chat" method="post" >
|
||||
@ -10,5 +11,4 @@
|
||||
<br />
|
||||
<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" />
|
||||
</form>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h2>{{$header}}</h2>
|
||||
|
||||
{{if $is_owner}}
|
||||
@ -8,3 +9,4 @@
|
||||
|
||||
{{$rooms}}
|
||||
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<div id="files-mkdir-tools" class="section-content-tools-wrapper form-group">
|
||||
<div id="files-mkdir-tools" class="section-content-tools-wrapper">
|
||||
<label for="files-mkdir">{{$folder_header}}</label>
|
||||
<form method="post" action="">
|
||||
<input type="hidden" name="sabreAction" value="mkcol">
|
||||
@ -7,7 +7,7 @@
|
||||
</form>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
<div id="files-upload-tools" class="section-content-tools-wrapper form-group">
|
||||
<div id="files-upload-tools" class="section-content-tools-wrapper">
|
||||
{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
|
||||
<label for="files-upload">{{$upload_header}}</label>
|
||||
<form method="post" action="" enctype="multipart/form-data">
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h2>{{$header}}</h2>
|
||||
|
||||
<script>
|
||||
@ -23,4 +24,4 @@ function drophub(id) {
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h1>{{$title}}</h1>
|
||||
|
||||
<form enctype="multipart/form-data" action="profile_photo" method="post">
|
||||
@ -27,3 +28,4 @@
|
||||
<div id="profile-photo-link-select-wrapper">
|
||||
{{$select}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user