harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source 
Conflicts:
	version.inc
This commit is contained in:
friendica
2014-12-01 18:53:49 -08:00
parent 0b84ba1eab 460d379e7e
commit f3b92c0ef2
23 changed files with 9606 additions and 9463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Contact.php
+6 -4
View File
@@ -128,12 +128,14 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
function abook_toggle_flag($abook,$flag) {
$r = q("UPDATE abook set abook_flags = (abook_flags & ~%d) where abook_id = %d and abook_channel = %d",
intval($flag),
intval($abook['abook_id']),
intval($abook['abook_channel'])
$r = q("UPDATE abook set abook_flags = (abook_flags %s %d) where abook_id = %d and abook_channel = %d",
db_getfunc('^'),
intval($flag),
intval($abook['abook_id']),
intval($abook['abook_channel'])
);
// if unsetting the archive bit, update the timestamps so we'll try to connect for an additional 30 days.
if(($flag === ABOOK_FLAG_ARCHIVED) && ($abook['abook_flags'] & ABOOK_FLAG_ARCHIVED)) {
include/conversation.php
+2 -2
View File
@@ -915,8 +915,8 @@ function item_photo_menu($item){
if($contact) {
$poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $contact['abook_id'];
if (!($contact['abook_flags'] & ABOOK_FLAG_SELF))
$contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id'];
if (!($contact['abook_flags'] & ABOOK_FLAG_SELF))
$contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id'];
$posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $contact['abook_id'];
$clean_url = normalise_link($item['author-link']);
include/zot.php
+1
View File
@@ -1419,6 +1419,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
}
foreach($deliveries as $d) {
$public = false;
$r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash'])
);
library/bootstrap/css/bootstrap-theme.css
Vendored
+47 -34
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.0 (http://getbootstrap.com)
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@@ -69,28 +69,28 @@
background-image: none;
}
.btn-primary {
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#2d6ca2));
background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
background-image: linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #2b669a;
border-color: #245580;
}
.btn-primary:hover,
.btn-primary:focus {
background-color: #2d6ca2;
background-color: #265a88;
background-position: 0 -15px;
}
.btn-primary:active,
.btn-primary.active {
background-color: #2d6ca2;
border-color: #2b669a;
background-color: #265a88;
border-color: #245580;
}
.btn-primary:disabled,
.btn-primary[disabled] {
background-color: #2d6ca2;
background-color: #265a88;
background-image: none;
}
.btn-success {
@@ -211,12 +211,12 @@
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
background-color: #357ebd;
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd));
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
background-color: #2e6da4;
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
background-repeat: repeat-x;
}
.navbar-default {
@@ -275,6 +275,19 @@
.navbar-fixed-bottom {
border-radius: 0;
}
@media (max-width: 767px) {
.navbar .navbar-nav .open .dropdown-menu > .active > a,
.navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #fff;
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
background-repeat: repeat-x;
}
}
.alert {
text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
@@ -325,11 +338,11 @@
background-repeat: repeat-x;
}
.progress-bar {
background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #3071a9 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3071a9));
background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #286090 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
background-image: linear-gradient(to bottom, #337ab7 0%, #286090 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
background-repeat: repeat-x;
}
.progress-bar-success {
@@ -377,14 +390,14 @@
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
text-shadow: 0 -1px 0 #3071a9;
background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #3278b3 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3278b3));
background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
text-shadow: 0 -1px 0 #286090;
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
background-image: linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
background-repeat: repeat-x;
border-color: #3278b3;
border-color: #2b669a;
}
.list-group-item.active .badge,
.list-group-item.active:hover .badge,
@@ -404,11 +417,11 @@
background-repeat: repeat-x;
}
.panel-primary > .panel-heading {
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd));
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
background-repeat: repeat-x;
}
.panel-success > .panel-heading {
library/bootstrap/css/bootstrap-theme.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
library/bootstrap/css/bootstrap.css
Vendored
+79 -105
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.0 (http://getbootstrap.com)
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@@ -915,12 +915,12 @@ textarea {
line-height: inherit;
}
a {
color: #428bca;
color: #337ab7;
text-decoration: none;
}
a:hover,
a:focus {
color: #2a6496;
color: #23527c;
text-decoration: underline;
}
a:focus {
@@ -1153,10 +1153,10 @@ mark,
color: #777;
}
.text-primary {
color: #428bca;
color: #337ab7;
}
a.text-primary:hover {
color: #3071a9;
color: #286090;
}
.text-success {
color: #3c763d;
@@ -1184,10 +1184,10 @@ a.text-danger:hover {
}
.bg-primary {
color: #fff;
background-color: #428bca;
background-color: #337ab7;
}
a.bg-primary:hover {
background-color: #3071a9;
background-color: #286090;
}
.bg-success {
background-color: #dff0d8;
@@ -2400,56 +2400,25 @@ textarea.form-control {
input[type="search"] {
-webkit-appearance: none;
}
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
line-height: 34px;
line-height: 1.42857143 \0;
}
input[type="date"].input-sm,
input[type="time"].input-sm,
input[type="datetime-local"].input-sm,
input[type="month"].input-sm {
line-height: 30px;
line-height: 1.5 \0;
}
input[type="date"].input-lg,
input[type="time"].input-lg,
input[type="datetime-local"].input-lg,
input[type="month"].input-lg {
line-height: 46px;
line-height: 1.33 \0;
}
_:-ms-fullscreen,
:root input[type="date"],
_:-ms-fullscreen,
:root input[type="time"],
_:-ms-fullscreen,
:root input[type="datetime-local"],
_:-ms-fullscreen,
:root input[type="month"] {
line-height: 1.42857143;
}
_:-ms-fullscreen.input-sm,
:root input[type="date"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="time"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="datetime-local"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="month"].input-sm {
line-height: 1.5;
}
_:-ms-fullscreen.input-lg,
:root input[type="date"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="time"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="datetime-local"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="month"].input-lg {
line-height: 1.33;
@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
line-height: 34px;
}
input[type="date"].input-sm,
input[type="time"].input-sm,
input[type="datetime-local"].input-sm,
input[type="month"].input-sm {
line-height: 30px;
}
input[type="date"].input-lg,
input[type="time"].input-lg,
input[type="datetime-local"].input-lg,
input[type="month"].input-lg {
line-height: 46px;
}
}
.form-group {
margin-bottom: 15px;
@@ -2880,8 +2849,8 @@ fieldset[disabled] .btn-default.active {
}
.btn-primary {
color: #fff;
background-color: #428bca;
border-color: #357ebd;
background-color: #337ab7;
border-color: #2e6da4;
}
.btn-primary:hover,
.btn-primary:focus,
@@ -2890,8 +2859,8 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
color: #fff;
background-color: #3071a9;
border-color: #285e8e;
background-color: #286090;
border-color: #204d74;
}
.btn-primary:active,
.btn-primary.active,
@@ -2916,11 +2885,11 @@ fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #428bca;
border-color: #357ebd;
background-color: #337ab7;
border-color: #2e6da4;
}
.btn-primary .badge {
color: #428bca;
color: #337ab7;
background-color: #fff;
}
.btn-success {
@@ -3105,7 +3074,7 @@ fieldset[disabled] .btn-danger.active {
}
.btn-link {
font-weight: normal;
color: #428bca;
color: #337ab7;
border-radius: 0;
}
.btn-link,
@@ -3125,7 +3094,7 @@ fieldset[disabled] .btn-link {
}
.btn-link:hover,
.btn-link:focus {
color: #2a6496;
color: #23527c;
text-decoration: underline;
background-color: transparent;
}
@@ -3274,7 +3243,7 @@ tbody.collapse.in {
.dropdown-menu > .active > a:focus {
color: #fff;
text-decoration: none;
background-color: #428bca;
background-color: #337ab7;
outline: 0;
}
.dropdown-menu > .disabled > a,
@@ -3367,10 +3336,6 @@ tbody.collapse.in {
.btn-group-vertical > .btn.active {
z-index: 2;
}
.btn-group > .btn:focus,
.btn-group-vertical > .btn:focus {
outline: 0;
}
.btn-group .btn + .btn,
.btn-group .btn + .btn-group,
.btn-group .btn-group + .btn,
@@ -3705,7 +3670,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #eee;
border-color: #428bca;
border-color: #337ab7;
}
.nav .nav-divider {
height: 1px;
@@ -3798,7 +3763,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #fff;
background-color: #428bca;
background-color: #337ab7;
}
.nav-stacked > li {
float: none;
@@ -4155,6 +4120,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-top-right-radius: 0;
}
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
@@ -4425,7 +4392,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
color: #428bca;
color: #337ab7;
text-decoration: none;
background-color: #fff;
border: 1px solid #ddd;
@@ -4445,7 +4412,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
color: #2a6496;
color: #23527c;
background-color: #eee;
border-color: #ddd;
}
@@ -4458,8 +4425,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
z-index: 2;
color: #fff;
cursor: default;
background-color: #428bca;
border-color: #428bca;
background-color: #337ab7;
border-color: #337ab7;
}
.pagination > .disabled > span,
.pagination > .disabled > span:hover,
@@ -4573,11 +4540,11 @@ a.label:focus {
background-color: #5e5e5e;
}
.label-primary {
background-color: #428bca;
background-color: #337ab7;
}
.label-primary[href]:hover,
.label-primary[href]:focus {
background-color: #3071a9;
background-color: #286090;
}
.label-success {
background-color: #5cb85c;
@@ -4638,11 +4605,17 @@ a.badge:focus {
text-decoration: none;
cursor: pointer;
}
a.list-group-item.active > .badge,
.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #428bca;
color: #337ab7;
background-color: #fff;
}
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
.nav-pills > li > a > .badge {
margin-left: 3px;
}
@@ -4675,7 +4648,8 @@ a.list-group-item.active > .badge,
.jumbotron {
padding: 48px 0;
}
.container .jumbotron {
.container .jumbotron,
.container-fluid .jumbotron {
padding-right: 60px;
padding-left: 60px;
}
@@ -4704,7 +4678,7 @@ a.list-group-item.active > .badge,
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
border-color: #428bca;
border-color: #337ab7;
}
.thumbnail .caption {
padding: 9px;
@@ -4826,7 +4800,7 @@ a.thumbnail.active {
line-height: 20px;
color: #fff;
text-align: center;
background-color: #428bca;
background-color: #337ab7;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-webkit-transition: width .6s ease;
@@ -4934,12 +4908,6 @@ a.thumbnail.active {
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
}
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
a.list-group-item {
color: #555;
}
@@ -4974,8 +4942,8 @@ a.list-group-item:focus {
.list-group-item.active:focus {
z-index: 2;
color: #fff;
background-color: #428bca;
border-color: #428bca;
background-color: #337ab7;
border-color: #337ab7;
}
.list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading,
@@ -4991,7 +4959,7 @@ a.list-group-item:focus {
.list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text {
color: #e1edf7;
color: #c7ddef;
}
.list-group-item-success {
color: #3c763d;
@@ -5335,22 +5303,22 @@ a.list-group-item-danger.active:focus {
border-bottom-color: #ddd;
}
.panel-primary {
border-color: #428bca;
border-color: #337ab7;
}
.panel-primary > .panel-heading {
color: #fff;
background-color: #428bca;
border-color: #428bca;
background-color: #337ab7;
border-color: #337ab7;
}
.panel-primary > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #428bca;
border-top-color: #337ab7;
}
.panel-primary > .panel-heading .badge {
color: #428bca;
color: #337ab7;
background-color: #fff;
}
.panel-primary > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #428bca;
border-bottom-color: #337ab7;
}
.panel-success {
border-color: #d6e9c6;
@@ -5549,10 +5517,9 @@ button.close {
box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
}
.modal-backdrop {
position: fixed;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: #000;
}
@@ -5624,7 +5591,9 @@ button.close {
position: absolute;
z-index: 1070;
display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px;
font-weight: normal;
line-height: 1.4;
visibility: visible;
filter: alpha(opacity=0);
@@ -5674,14 +5643,16 @@ button.close {
border-top-color: #000;
}
.tooltip.top-left .tooltip-arrow {
right: 5px;
bottom: 0;
left: 5px;
margin-bottom: -5px;
border-width: 5px 5px 0;
border-top-color: #000;
}
.tooltip.top-right .tooltip-arrow {
right: 5px;
bottom: 0;
left: 5px;
margin-bottom: -5px;
border-width: 5px 5px 0;
border-top-color: #000;
}
@@ -5708,13 +5679,15 @@ button.close {
}
.tooltip.bottom-left .tooltip-arrow {
top: 0;
left: 5px;
right: 5px;
margin-top: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
.tooltip.bottom-right .tooltip-arrow {
top: 0;
right: 5px;
left: 5px;
margin-top: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000;
}
@@ -5726,6 +5699,7 @@ button.close {
display: none;
max-width: 276px;
padding: 1px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 1.42857143;
library/bootstrap/css/bootstrap.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
library/bootstrap/js/bootstrap.js
Vendored
+73 -29
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.0 (http://getbootstrap.com)
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@@ -16,7 +16,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: transition.js v3.3.0
* Bootstrap: transition.js v3.3.1
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -76,7 +76,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: alert.js v3.3.0
* Bootstrap: alert.js v3.3.1
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -95,7 +95,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close)
}
Alert.VERSION = '3.3.0'
Alert.VERSION = '3.3.1'
Alert.TRANSITION_DURATION = 150
@@ -171,7 +171,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: button.js v3.3.0
* Bootstrap: button.js v3.3.1
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -191,7 +191,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false
}
Button.VERSION = '3.3.0'
Button.VERSION = '3.3.1'
Button.DEFAULTS = {
loadingText: 'loading...'
@@ -282,13 +282,13 @@ if (typeof jQuery === 'undefined') {
e.preventDefault()
})
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
$(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
})
}(jQuery);
/* ========================================================================
* Bootstrap: carousel.js v3.3.0
* Bootstrap: carousel.js v3.3.1
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -319,7 +319,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
Carousel.VERSION = '3.3.0'
Carousel.VERSION = '3.3.1'
Carousel.TRANSITION_DURATION = 600
@@ -331,6 +331,7 @@ if (typeof jQuery === 'undefined') {
}
Carousel.prototype.keydown = function (e) {
if (/input|textarea/i.test(e.target.tagName)) return
switch (e.which) {
case 37: this.prev(); break
case 39: this.next(); break
@@ -528,7 +529,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: collapse.js v3.3.0
* Bootstrap: collapse.js v3.3.1
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -557,7 +558,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle()
}
Collapse.VERSION = '3.3.0'
Collapse.VERSION = '3.3.1'
Collapse.TRANSITION_DURATION = 350
@@ -740,7 +741,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: dropdown.js v3.3.0
* Bootstrap: dropdown.js v3.3.1
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -760,7 +761,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle)
}
Dropdown.VERSION = '3.3.0'
Dropdown.VERSION = '3.3.1'
Dropdown.prototype.toggle = function (e) {
var $this = $(this)
@@ -796,7 +797,7 @@ if (typeof jQuery === 'undefined') {
}
Dropdown.prototype.keydown = function (e) {
if (!/(38|40|27|32)/.test(e.which)) return
if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
var $this = $(this)
@@ -902,7 +903,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: modal.js v3.3.0
* Bootstrap: modal.js v3.3.1
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -933,7 +934,7 @@ if (typeof jQuery === 'undefined') {
}
}
Modal.VERSION = '3.3.0'
Modal.VERSION = '3.3.1'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -959,10 +960,11 @@ if (typeof jQuery === 'undefined') {
this.isShown = true
this.checkScrollbar()
this.setScrollbar()
this.$body.addClass('modal-open')
this.setScrollbar()
this.escape()
this.resize()
this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
@@ -977,6 +979,9 @@ if (typeof jQuery === 'undefined') {
.show()
.scrollTop(0)
if (that.options.backdrop) that.adjustBackdrop()
that.adjustDialog()
if (transition) {
that.$element[0].offsetWidth // force reflow
}
@@ -1011,6 +1016,7 @@ if (typeof jQuery === 'undefined') {
this.isShown = false
this.escape()
this.resize()
$(document).off('focusin.bs.modal')
@@ -1046,11 +1052,20 @@ if (typeof jQuery === 'undefined') {
}
}
Modal.prototype.resize = function () {
if (this.isShown) {
$(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
} else {
$(window).off('resize.bs.modal')
}
}
Modal.prototype.hideModal = function () {
var that = this
this.$element.hide()
this.backdrop(function () {
that.$body.removeClass('modal-open')
that.resetAdjustments()
that.resetScrollbar()
that.$element.trigger('hidden.bs.modal')
})
@@ -1107,13 +1122,43 @@ if (typeof jQuery === 'undefined') {
}
}
// these following methods are used to handle overflowing modals
Modal.prototype.handleUpdate = function () {
if (this.options.backdrop) this.adjustBackdrop()
this.adjustDialog()
}
Modal.prototype.adjustBackdrop = function () {
this.$backdrop
.css('height', 0)
.css('height', this.$element[0].scrollHeight)
}
Modal.prototype.adjustDialog = function () {
var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
this.$element.css({
paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
})
}
Modal.prototype.resetAdjustments = function () {
this.$element.css({
paddingLeft: '',
paddingRight: ''
})
}
Modal.prototype.checkScrollbar = function () {
this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
this.scrollbarWidth = this.measureScrollbar()
}
Modal.prototype.setScrollbar = function () {
var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
}
Modal.prototype.resetScrollbar = function () {
@@ -1121,7 +1166,6 @@ if (typeof jQuery === 'undefined') {
}
Modal.prototype.measureScrollbar = function () { // thx walsh
if (document.body.clientWidth >= window.innerWidth) return 0
var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure'
this.$body.append(scrollDiv)
@@ -1184,7 +1228,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.3.0
* Bootstrap: tooltip.js v3.3.1
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@@ -1210,7 +1254,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options)
}
Tooltip.VERSION = '3.3.0'
Tooltip.VERSION = '3.3.1'
Tooltip.TRANSITION_DURATION = 150
@@ -1663,7 +1707,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: popover.js v3.3.0
* Bootstrap: popover.js v3.3.1
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -1683,7 +1727,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.0'
Popover.VERSION = '3.3.1'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
@@ -1783,7 +1827,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.0
* Bootstrap: scrollspy.js v3.3.1
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -1814,7 +1858,7 @@ if (typeof jQuery === 'undefined') {
this.process()
}
ScrollSpy.VERSION = '3.3.0'
ScrollSpy.VERSION = '3.3.1'
ScrollSpy.DEFAULTS = {
offset: 10
@@ -1959,7 +2003,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: tab.js v3.3.0
* Bootstrap: tab.js v3.3.1
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -1977,7 +2021,7 @@ if (typeof jQuery === 'undefined') {
this.element = $(element)
}
Tab.VERSION = '3.3.0'
Tab.VERSION = '3.3.1'
Tab.TRANSITION_DURATION = 150
@@ -2113,7 +2157,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: affix.js v3.3.0
* Bootstrap: affix.js v3.3.1
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@@ -2142,7 +2186,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition()
}
Affix.VERSION = '3.3.0'
Affix.VERSION = '3.3.1'
Affix.RESET = 'affix affix-top affix-bottom'
library/bootstrap/js/bootstrap.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
mod/connedit.php
+1
View File
@@ -504,6 +504,7 @@ function connedit_content(&$a) {
$slider_tpl = get_markup_template('contact_slider.tpl');
$slide = replace_macros($slider_tpl,array(
'$me' => t('Me'),
'$min' => 1,
'$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99),
'$intimate' => t('Best Friends'),
'$friends' => t('Friends'),
mod/help.php
+1 -1
View File
@@ -98,7 +98,7 @@ function preg_callback_help_include($matches) {
if($matches[1]) {
$include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]);
if(preg_match('/\.bb$/', $matches[1])) {
if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) {
require_once('include/bbcode.php');
$include = bbcode($include);
} elseif(preg_match('/\.md$/', $matches[1])) {
mod/settings.php
+11 -6
View File
@@ -763,13 +763,18 @@ function settings_content(&$a) {
$is_experimental = file_exists('view/theme/' . $th . '/experimental');
$unsupported = file_exists('view/theme/' . $th . '/unsupported');
$is_mobile = file_exists('view/theme/' . $th . '/mobile');
$is_library = file_exists('view/theme/'. $th . '/library');
if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
$theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f);
if($is_mobile) {
$mobile_themes[$f]=$theme_name;
}
else {
$themes[$f]=$theme_name;
if (! $is_library) {
if($is_mobile) {
$themes[$f]=$theme_name . ' (' . t('mobile') . ')';
}
else {
$themes[$f]=$theme_name;
}
}
}
}
@@ -807,7 +812,7 @@ function settings_content(&$a) {
'$uid' => local_user(),
'$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview'),
'$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, ''),
'$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $themes, ''),
'$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, ''),
'$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
'$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
version.inc
+2 -1
View File
@@ -1 +1,2 @@
2014-12-01.876
2014-12-02.877
view/css/bootstrap-red.css
Vendored
+18
View File
@@ -17,6 +17,20 @@ nav .badge {
cursor: pointer;
}
nav i {
font-size: 14px;
}
nav ul li {
max-height: 49px;
}
nav img {
height: 48px;
width: 48px;
margin-top: 1px;
}
nav .dropdown-menu {
top: 50px;
max-height: 450px;
@@ -53,6 +67,10 @@ nav .navbar-collapse .navbar-right {
float: right;
}
nav .navbar-toggle {
margin-bottom: 7px;
}
/* nav overrides end */
.dropdown-menu img {
view/it/messages.po
+3549 -3516
View File
File diff suppressed because it is too large Load Diff
view/it/strings.php
+863 -854
View File
File diff suppressed because it is too large Load Diff
view/nl/messages.po
+3532 -3499
View File
File diff suppressed because it is too large Load Diff
view/nl/strings.php
+826 -817
View File
File diff suppressed because it is too large Load Diff
view/sv/messages.po
+496 -488
View File
File diff suppressed because it is too large Load Diff
view/sv/strings.php
+88 -86
View File
@@ -404,10 +404,11 @@ $a->strings["likes"] = "gillar";
$a->strings["dislike"] = "ogilla";
$a->strings["dislikes"] = "ogillar";
$a->strings["Public Timeline"] = "Offentlig tidslinje";
$a->strings["Sort Options"] = "Sorteringsalternativ";
$a->strings["Directory Options"] = "Katalogalternativ";
$a->strings["Alphabetic"] = "Alfabetisk";
$a->strings["Reverse Alphabetic"] = "Omvänd alfabetisk";
$a->strings["Newest to Oldest"] = "Nyast till äldst";
$a->strings["Public Forums Only"] = "Endast offentliga forum";
$a->strings["Enable Safe Search"] = "Aktivera säker sökning";
$a->strings["Disable Safe Search"] = "Avaktivera säker sökning";
$a->strings["Safe Mode"] = "Säkert läge";
@@ -522,79 +523,6 @@ $a->strings["Star Posts"] = "Märk inlägg";
$a->strings["Ability to mark special posts with a star indicator"] = "Möjlighet att märka speciella inlägg med en stjärna";
$a->strings["Tag Cloud"] = "Taggmoln";
$a->strings["Provide a personal tag cloud on your channel page"] = "Tillhandahåll ett personligt taggmoln på din kanalsida";
$a->strings["Not a valid email address"] = "Inte en giltig e-postadress";
$a->strings["Your email domain is not among those allowed on this site"] = "Din e-postdomän är inte bland de som tillåts på den här servern";
$a->strings["Your email address is already registered at this site."] = "Din e-postadress är redan registrerad på den här servern.";
$a->strings["An invitation is required."] = "En inbjudan behövs.";
$a->strings["Invitation could not be verified."] = "Inbjudningen kunde inte bekräftas.";
$a->strings["Please enter the required information."] = "Ange den begärda informationen.";
$a->strings["Failed to store account information."] = "Misslyckades att spara kontoinformation.";
$a->strings["Registration confirmation for %s"] = "Registreringsbekräftelse för %s";
$a->strings["Registration request at %s"] = "Registreringsförfrågan på %s";
$a->strings["Administrator"] = "Administratör";
$a->strings["your registration password"] = "ditt registreringslösenord";
$a->strings["Registration details for %s"] = "Registreringsdetaljer för %s";
$a->strings["Account approved."] = "Konto godkänt.";
$a->strings["Registration revoked for %s"] = "Registrering avslagen för %s";
$a->strings["Account verified. Please login."] = "Konto bekräftat. Du kan nu logga in.";
$a->strings["Click here to upgrade."] = "Klicka här för att uppgradera.";
$a->strings["This action exceeds the limits set by your subscription plan."] = "Den här funktionen går utanför vad som anges i ditt avtal.";
$a->strings["This action is not available under your subscription plan."] = "Den här funktionen är inte tillgänglig med ditt avtal.";
$a->strings["Can view my normal stream and posts"] = "Kan se mina normala strömmar och inlägg";
$a->strings["Can view my default channel profile"] = "Kan se min standardkanalprofil";
$a->strings["Can view my photo albums"] = "Kan se mina fotoalbum";
$a->strings["Can view my connections"] = "Kan se mina kontakter";
$a->strings["Can view my file storage"] = "Kan se mitt filutrymme";
$a->strings["Can view my webpages"] = "Kan se mina webbsidor";
$a->strings["Can send me their channel stream and posts"] = "Kan skicka sina kanalströmmar och inlägg till mig";
$a->strings["Can post on my channel page (\"wall\")"] = "Kan posta inlägg på min kanalsida (\"vägg\")";
$a->strings["Can comment on or like my posts"] = "Kan kommentera eller gilla mina inlägg";
$a->strings["Can send me private mail messages"] = "Kan skicka privata meddelanden till mig";
$a->strings["Can post photos to my photo albums"] = "Kan lägga till foton i mitt fotoalbum";
$a->strings["Can like/dislike stuff"] = "Kan gilla/ogilla saker";
$a->strings["Profiles and things other than posts/comments"] = "Profiler och annat än inlägg/kommentarer";
$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kan vidarebefordra till alla mina kanalkontakter genom @omnämnanden";
$a->strings["Advanced - useful for creating group forum channels"] = "Avancerat - användbart för att skapa kanaler för gruppforum";
$a->strings["Can chat with me (when available)"] = "Kan chatta med mig (när tillgänglig)";
$a->strings["Can write to my file storage"] = "Har skrivrättigheter i mitt filutrymme";
$a->strings["Can edit my webpages"] = "Kan redigera mina webbsidor";
$a->strings["Can source my public posts in derived channels"] = "Kan använda mina offentliga inlägg i kanaler nedströms";
$a->strings["Somewhat advanced - very useful in open communities"] = "Ganska avancerat - väldigt användbart i öppna gemenskaper";
$a->strings["Can administer my channel resources"] = "Kan administrera mina kanalresurser";
$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremt avancerat. Låt detta vara om du inte vet vad du gör";
$a->strings["Social Networking"] = "Socialt nätverkande";
$a->strings["Mostly Public"] = "Mestadels offentligt";
$a->strings["Restricted"] = "Begränsat";
$a->strings["Private"] = "Privat";
$a->strings["Community Forum"] = "Gemenskapsforum";
$a->strings["Feed Republish"] = "Vidarepublicering av flöde";
$a->strings["Special Purpose"] = "Särskilt syfte";
$a->strings["Celebrity/Soapbox"] = "Kändis/talarstol";
$a->strings["Group Repository"] = "Gruppförråd";
$a->strings["Other"] = "Annat";
$a->strings["Custom/Expert Mode"] = "Anpassat/expertläge";
$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild överskrider webbplatsens storleksbegränsning på %lu byte";
$a->strings["Image file is empty."] = "Bildfil är tom.";
$a->strings["Unable to process image"] = "Kunde inte bearbeta bild";
$a->strings["Photo storage failed."] = "Fotolagring misslyckades.";
$a->strings["Upload New Photos"] = "Ladda upp nya foton";
$a->strings["Permission denied"] = "Behörighet saknas";
$a->strings["(Unknown)"] = "(Okänt)";
$a->strings["Visible to anybody on the internet."] = "Kan ses av vem som helst på Internet.";
$a->strings["Visible to you only."] = "Kan bara ses av dig.";
$a->strings["Visible to anybody in this network."] = "Kan ses av alla på det här nätverket.";
$a->strings["Visible to anybody authenticated."] = "Kan ses av alla inloggade.";
$a->strings["Visible to anybody on %s."] = "Kan ses av alla på %s.";
$a->strings["Visible to all connections."] = "Kan ses av alla kontakter.";
$a->strings["Visible to approved connections."] = "Kan ses av godkända kontakter.";
$a->strings["Visible to specific connections."] = "Kan ses av valda kontakter.";
$a->strings["Item not found."] = "Posten hittades inte.";
$a->strings["Collection not found."] = "Kretsen hittades inte.";
$a->strings["Collection is empty."] = "Kretsen är tom.";
$a->strings["Collection: %s"] = "Krets: %s";
$a->strings["Connection: %s"] = "Kontakt: %s";
$a->strings["Connection not found."] = "Kontakten hittades inte.";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Formulärets kontrollkod var inte korrekt. Antagligen beror det på att formuläret har varit öppet för länge (> 3 timmar) innan det skickades.";
$a->strings["prev"] = "föregående";
$a->strings["first"] = "första";
$a->strings["last"] = "sista";
@@ -675,6 +603,79 @@ $a->strings["Blocks"] = "Block";
$a->strings["Menus"] = "Menyer";
$a->strings["Layouts"] = "Layouter";
$a->strings["Pages"] = "Sidor";
$a->strings["Not a valid email address"] = "Inte en giltig e-postadress";
$a->strings["Your email domain is not among those allowed on this site"] = "Din e-postdomän är inte bland de som tillåts på den här servern";
$a->strings["Your email address is already registered at this site."] = "Din e-postadress är redan registrerad på den här servern.";
$a->strings["An invitation is required."] = "En inbjudan behövs.";
$a->strings["Invitation could not be verified."] = "Inbjudningen kunde inte bekräftas.";
$a->strings["Please enter the required information."] = "Ange den begärda informationen.";
$a->strings["Failed to store account information."] = "Misslyckades att spara kontoinformation.";
$a->strings["Registration confirmation for %s"] = "Registreringsbekräftelse för %s";
$a->strings["Registration request at %s"] = "Registreringsförfrågan på %s";
$a->strings["Administrator"] = "Administratör";
$a->strings["your registration password"] = "ditt registreringslösenord";
$a->strings["Registration details for %s"] = "Registreringsdetaljer för %s";
$a->strings["Account approved."] = "Konto godkänt.";
$a->strings["Registration revoked for %s"] = "Registrering avslagen för %s";
$a->strings["Account verified. Please login."] = "Konto bekräftat. Du kan nu logga in.";
$a->strings["Click here to upgrade."] = "Klicka här för att uppgradera.";
$a->strings["This action exceeds the limits set by your subscription plan."] = "Den här funktionen går utanför vad som anges i ditt avtal.";
$a->strings["This action is not available under your subscription plan."] = "Den här funktionen är inte tillgänglig med ditt avtal.";
$a->strings["Can view my normal stream and posts"] = "Kan se mina normala strömmar och inlägg";
$a->strings["Can view my default channel profile"] = "Kan se min standardkanalprofil";
$a->strings["Can view my photo albums"] = "Kan se mina fotoalbum";
$a->strings["Can view my connections"] = "Kan se mina kontakter";
$a->strings["Can view my file storage"] = "Kan se mitt filutrymme";
$a->strings["Can view my webpages"] = "Kan se mina webbsidor";
$a->strings["Can send me their channel stream and posts"] = "Kan skicka sina kanalströmmar och inlägg till mig";
$a->strings["Can post on my channel page (\"wall\")"] = "Kan posta inlägg på min kanalsida (\"vägg\")";
$a->strings["Can comment on or like my posts"] = "Kan kommentera eller gilla mina inlägg";
$a->strings["Can send me private mail messages"] = "Kan skicka privata meddelanden till mig";
$a->strings["Can post photos to my photo albums"] = "Kan lägga till foton i mitt fotoalbum";
$a->strings["Can like/dislike stuff"] = "Kan gilla/ogilla saker";
$a->strings["Profiles and things other than posts/comments"] = "Profiler och annat än inlägg/kommentarer";
$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kan vidarebefordra till alla mina kanalkontakter genom @omnämnanden";
$a->strings["Advanced - useful for creating group forum channels"] = "Avancerat - användbart för att skapa kanaler för gruppforum";
$a->strings["Can chat with me (when available)"] = "Kan chatta med mig (när tillgänglig)";
$a->strings["Can write to my file storage"] = "Har skrivrättigheter i mitt filutrymme";
$a->strings["Can edit my webpages"] = "Kan redigera mina webbsidor";
$a->strings["Can source my public posts in derived channels"] = "Kan använda mina offentliga inlägg i kanaler nedströms";
$a->strings["Somewhat advanced - very useful in open communities"] = "Ganska avancerat - väldigt användbart i öppna gemenskaper";
$a->strings["Can administer my channel resources"] = "Kan administrera mina kanalresurser";
$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremt avancerat. Låt detta vara om du inte vet vad du gör";
$a->strings["Social Networking"] = "Socialt nätverkande";
$a->strings["Mostly Public"] = "Mestadels offentligt";
$a->strings["Restricted"] = "Begränsat";
$a->strings["Private"] = "Privat";
$a->strings["Community Forum"] = "Gemenskapsforum";
$a->strings["Feed Republish"] = "Vidarepublicering av flöde";
$a->strings["Special Purpose"] = "Särskilt syfte";
$a->strings["Celebrity/Soapbox"] = "Kändis/talarstol";
$a->strings["Group Repository"] = "Gruppförråd";
$a->strings["Other"] = "Annat";
$a->strings["Custom/Expert Mode"] = "Anpassat/expertläge";
$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild överskrider webbplatsens storleksbegränsning på %lu byte";
$a->strings["Image file is empty."] = "Bildfil är tom.";
$a->strings["Unable to process image"] = "Kunde inte bearbeta bild";
$a->strings["Photo storage failed."] = "Fotolagring misslyckades.";
$a->strings["Upload New Photos"] = "Ladda upp nya foton";
$a->strings["Permission denied"] = "Behörighet saknas";
$a->strings["(Unknown)"] = "(Okänt)";
$a->strings["Visible to anybody on the internet."] = "Kan ses av vem som helst på Internet.";
$a->strings["Visible to you only."] = "Kan bara ses av dig.";
$a->strings["Visible to anybody in this network."] = "Kan ses av alla på det här nätverket.";
$a->strings["Visible to anybody authenticated."] = "Kan ses av alla inloggade.";
$a->strings["Visible to anybody on %s."] = "Kan ses av alla på %s.";
$a->strings["Visible to all connections."] = "Kan ses av alla kontakter.";
$a->strings["Visible to approved connections."] = "Kan ses av godkända kontakter.";
$a->strings["Visible to specific connections."] = "Kan ses av valda kontakter.";
$a->strings["Item not found."] = "Posten hittades inte.";
$a->strings["Collection not found."] = "Kretsen hittades inte.";
$a->strings["Collection is empty."] = "Kretsen är tom.";
$a->strings["Collection: %s"] = "Krets: %s";
$a->strings["Connection: %s"] = "Kontakt: %s";
$a->strings["Connection not found."] = "Kontakten hittades inte.";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Formulärets kontrollkod var inte korrekt. Antagligen beror det på att formuläret har varit öppet för länge (> 3 timmar) innan det skickades.";
$a->strings["System"] = "System";
$a->strings["Create Personal App"] = "Skapa personlig app";
$a->strings["Edit Personal App"] = "Redigera personlig app";
@@ -1172,6 +1173,7 @@ $a->strings["l, F j"] = "l, j F";
$a->strings["Edit event"] = "Redigera händelse";
$a->strings["Create New Event"] = "Skapa ny händelse";
$a->strings["Previous"] = "Föregående";
$a->strings["Export"] = "Exportera";
$a->strings["Event details"] = "Detaljer för händelse";
$a->strings["Starting date and Title are required."] = "Startdatum och titel är obligatoriska.";
$a->strings["Event Starts:"] = "Händelsen börjar:";
@@ -1204,9 +1206,6 @@ $a->strings["Bookmark this room"] = "Bokmärk det här rummet";
$a->strings["New Chatroom"] = "Nytt chattrum";
$a->strings["Chatroom Name"] = "Namn på chattrum";
$a->strings["%1\$s's Chatrooms"] = "%1\$ss chattrum";
$a->strings["Away"] = "Borta";
$a->strings["Online"] = "Online";
$a->strings["Please login."] = "Logga in.";
$a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Installerade tillägg/moduler/appar:";
$a->strings["No installed plugins/addons/apps"] = "Inga installerade tillägg/moduler/appar";
@@ -1217,6 +1216,18 @@ $a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn
$a->strings["Bug reports and issues: please visit"] = "Buggrapporter och problem: besök";
$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Förslag, uppskattning, etc. - maila \"redmatrix\" at librelist - dot com";
$a->strings["Site Administrators"] = "Serveradministratörer";
$a->strings["Away"] = "Borta";
$a->strings["Online"] = "Online";
$a->strings["Please login."] = "Logga in.";
$a->strings["Continue"] = "Fortsätt";
$a->strings["Premium Channel Setup"] = "Inställning av premiumkanal";
$a->strings["Enable premium channel connection restrictions"] = "Aktivera kontaktrestriktioner för premiumkanal";
$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Ange dina restriktioner och villkor, som Paypal-kvitto, användarriktlinjer, etc.";
$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Den här kanalen kan kräva ytterligare steg eller godkännande av följande villkor innan anslutning:";
$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentiella kontakter kommer sedan att se följande text innan de går vidare:";
$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Genom att fortsätta intygar jag att jag har följt alla instruktioner som ges på den här sidan.";
$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Inga specifika instruktioner har givits av kanalägaren.)";
$a->strings["Restricted or Premium Channel"] = "Begränsad kanal eller premiumkanal";
$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Borttagning av kanal tillåts inte inom 48 timmar efter att kontolösenordet har ändrats.";
$a->strings["Remove This Channel"] = "Ta bort den här kanalen";
$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Det här kommer att ta bort den här kanalen helt från nätverket. När det är gjort går det inte att återställa den.";
@@ -1458,15 +1469,6 @@ $a->strings["Delete layout?"] = "Ta bort layout?";
$a->strings["Delete Layout"] = "Ta bort layout";
$a->strings["Item is not editable"] = "Posten går ej att redigera";
$a->strings["Delete item?"] = "Ta bort posten?";
$a->strings["Continue"] = "Fortsätt";
$a->strings["Premium Channel Setup"] = "Inställning av premiumkanal";
$a->strings["Enable premium channel connection restrictions"] = "Aktivera kontaktrestriktioner för premiumkanal";
$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Ange dina restriktioner och villkor, som Paypal-kvitto, användarriktlinjer, etc.";
$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Den här kanalen kan kräva ytterligare steg eller godkännande av följande villkor innan anslutning:";
$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentiella kontakter kommer sedan att se följande text innan de går vidare:";
$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Genom att fortsätta intygar jag att jag har följt alla instruktioner som ges på den här sidan.";
$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Inga specifika instruktioner har givits av kanalägaren.)";
$a->strings["Restricted or Premium Channel"] = "Begränsad kanal eller premiumkanal";
$a->strings["Edit Webpage"] = "Redigera webbsida";
$a->strings["Delete webpage?"] = "Ta bort webbsida?";
$a->strings["Delete Webpage"] = "Ta bort webbsida";
view/theme/redbasic/css/style.css
+2 -12
View File
@@ -1405,7 +1405,7 @@ div.jGrowl div.jGrowl-notification {
#nav-search-text-ac .autocomplete {
position: fixed;
top: 51px;
top: 50px;
border: 1px solid $nav_bd;
border-top: none;
}
@@ -2058,21 +2058,11 @@ img.mail-list-sender-photo {
/* nav bootstrap */
nav i {
font-size: 14px;
}
nav img {
height: 47px;
width: 47px;
margin-top: 2px;
border-radius: $radiuspx;
}
nav ul li {
max-height: 50px
}
nav .dropdown-menu {
font-size: $body_font_size;
border-top-right-radius: 0px;
@@ -2395,4 +2385,4 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.bb_observer img {
border: 3px solid red !important;
}
}
view/theme/redbasic/php/style.php
+1 -1
View File
@@ -108,7 +108,7 @@ if(! $a->install) {
if (! $navtabs_bgchover)
$navtabs_bgchover = "rgba(238,238,238,0.8)";
if (! $link_colour)
$link_colour = "#428BCA";
$link_colour = "#337AB7";
if (! $navaside_bghover)
$navaside_bghover = "#eee";
if (! $link_font_weight)
view/tpl/contact_slider.tpl
+1 -1
View File
@@ -1,4 +1,4 @@
<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
<script>
$("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
$("#contact-range").slider({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
</script>