Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse source
This commit is contained in:
redmatrix 2015-11-03 14:59:43 -08:00
commit c1cfcc78fe
9 changed files with 38 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/credits.bb
View file

@ -14,7 +14,7 @@ tommy tomson
Simon Simon
zottel zottel
Christian Vogeley Christian Vogeley
jeroenpraat Jeroen van Riet Paap (jeroenpraat)
Michael Vogel Michael Vogel
erik erik
Zach Prezkuta Zach Prezkuta

2
include/widgets.php
View file

@ -642,7 +642,7 @@ function widget_conversations($arr) {
'subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), 'subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
'delete' => t('Delete conversation'), 'delete' => t('Delete conversation'),
'body' => $rr['body'], 'body' => $rr['body'],
'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')), 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
'seen' => $rr['seen'], 'seen' => $rr['seen'],
'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id'])) 'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
); );

2
mod/mail.php
View file

@ -335,7 +335,7 @@ function mail_content(&$a) {
'recall' => t('Recall message'), 'recall' => t('Recall message'),
'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false), 'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false),
'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''),
'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'),
); );
$seen = $message['seen']; $seen = $message['seen'];

1
view/js/main.js
View file

@ -1166,7 +1166,6 @@ $(document).ready(function() {
numbers : aStr['t17'], numbers : aStr['t17'],
}; };
$(".autotime").timeago();
$("#toc").toc(); $("#toc").toc();
}); });

1
view/js/mod_mail.js
View file

@ -2,4 +2,5 @@ $(document).ready(function() {
$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) { $("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
$("#recip-complete").val(data.xid); $("#recip-complete").val(data.xid);
}); });
$(".autotime").timeago()
}); });

8
view/nl/hmessages.po
View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Redmatrix\n" "Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-30 00:03-0700\n" "POT-Creation-Date: 2015-10-30 00:03-0700\n"
"PO-Revision-Date: 2015-10-31 20:03+0000\n" "PO-Revision-Date: 2015-11-03 20:14+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n" "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n" "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -569,11 +569,11 @@ msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde g
#: ../../include/features.php:61 #: ../../include/features.php:61
msgid "Enable Voting Tools" msgid "Enable Voting Tools"
msgstr "Stemmen inschakelen" msgstr "Peilingen inschakelen"
#: ../../include/features.php:61 #: ../../include/features.php:61
msgid "Provide a class of post which others can vote on" msgid "Provide a class of post which others can vote on"
msgstr "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen." msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen."
#: ../../include/features.php:62 #: ../../include/features.php:62
msgid "Delayed Posting" msgid "Delayed Posting"
@ -3476,7 +3476,7 @@ msgstr "locatie instellen"
#: ../../include/conversation.php:1207 ../../mod/editpost.php:126 #: ../../include/conversation.php:1207 ../../mod/editpost.php:126
msgid "Toggle voting" msgid "Toggle voting"
msgstr "Stemmen in- of uitschakelen" msgstr "Peiling in- of uitschakelen"
#: ../../include/conversation.php:1210 ../../mod/editblock.php:149 #: ../../include/conversation.php:1210 ../../mod/editblock.php:149
#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147 #: ../../mod/editpost.php:125 ../../mod/editlayout.php:147

6
view/nl/hstrings.php
View file

@ -121,8 +121,8 @@ $a->strings["Channel Sources"] = "Kanaalbronnen";
$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren."; $a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
$a->strings["Even More Encryption"] = "Extra encryptie"; $a->strings["Even More Encryption"] = "Extra encryptie";
$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."; $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
$a->strings["Enable Voting Tools"] = "Stemmen inschakelen"; $a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
$a->strings["Provide a class of post which others can vote on"] = "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen."; $a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
$a->strings["Delayed Posting"] = "Berichten uitstellen"; $a->strings["Delayed Posting"] = "Berichten uitstellen";
$a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden."; $a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter"; $a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
@ -807,7 +807,7 @@ $a->strings["Insert audio link"] = "Audiolink invoegen";
$a->strings["audio link"] = "audiolink"; $a->strings["audio link"] = "audiolink";
$a->strings["Set your location"] = "Locatie instellen"; $a->strings["Set your location"] = "Locatie instellen";
$a->strings["set location"] = "locatie instellen"; $a->strings["set location"] = "locatie instellen";
$a->strings["Toggle voting"] = "Stemmen in- of uitschakelen"; $a->strings["Toggle voting"] = "Peiling in- of uitschakelen";
$a->strings["Clear browser location"] = "Locatie van webbrowser wissen"; $a->strings["Clear browser location"] = "Locatie van webbrowser wissen";
$a->strings["clear location"] = "locatie wissen"; $a->strings["clear location"] = "locatie wissen";
$a->strings["Title (optional)"] = "Titel (optioneel)"; $a->strings["Title (optional)"] = "Titel (optioneel)";

40
view/theme/redbasic/schema/dark.css
View file

@ -119,26 +119,38 @@
} }
.btn-success { .btn-success {
color: #FFF; color: #FFF !important;
background-color: #5CB85C; background-color: #5CB85C !important;
border-color: #4CAE4C; border-color: #4CAE4C !important;
} }
.btn-success:hover, .btn-success:focus { .btn-success:hover, .btn-success:focus {
color: #FFF; color: #FFF !important;
background-color: #449D44; background-color: #449D44 !important;
border-color: #398439; border-color: #398439 !important;
} }
.btn-danger { .btn-warning {
background-color: #D9534F; color: #FFF !important;
border-color: #D43F3A; background-color: #F0AD4E !important;
color: #FFF; border-color: #EEA236 !important;
} }
.btn-danger:hover, .btn-danger:focus {
color: #FFF; .btn-warning:hover, .btn-warning:focus {
background-color: #C9302C; color: #FFF !important;
border-color: #AC2925; background-color: #EC971F !important;
border-color: #D58512 !important;
}
.btn-danger, form#chat-destroy > input {
background-color: #D9534F !important;
border-color: #D43F3A !important;
color: #FFF !important;
}
.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
color: #FFF !important;
background-color: #C9302C !important;
border-color: #AC2925 !important;
} }
.pager_first, .pager_first,

2
view/tpl/prv_message.tpl
View file

@ -31,7 +31,7 @@
<div class="form-group"> <div class="form-group">
<label for="prvmail-text">{{$yourmessage}}</label> <label for="prvmail-text">{{$yourmessage}}</label>
<textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea> <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea>
</div> </div>
<div id="prvmail-submit-wrapper" class="form-group"> <div id="prvmail-submit-wrapper" class="form-group">