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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Haakon Meland Eriksen 2016-01-22 06:37:30 +01:00
commit b0d5b9fd2c
17 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/permissions.php
View File

@ -641,10 +641,10 @@ function get_role_perms($role) {
$ret['directory_publish'] = true;
$ret['online'] = false;
$ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK
|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
$ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK
|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
$ret['channel_r_stream'] = PERMS_PUBLIC;
$ret['channel_r_profile'] = PERMS_PUBLIC;

2
include/text.php
View File

@ -2716,5 +2716,7 @@ function item_url_replace($channel,&$item,$old,$new) {
$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
$item['item_verified'] = 1;
}
// @fixme item['plink'] and item['llink']
}

0
library/HTMLPurifier/DefinitionCache/Serializer/README Executable file → Normal file
View File

0
library/font_awesome/src/assets/css/prettify.css Executable file → Normal file
View File

0
library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf Executable file → Normal file
View File

0
library/stylish_select/stylish-select.css Executable file → Normal file
View File

2
mod/lostpass.php
View File

@ -87,7 +87,7 @@ function lostpass_content(&$a) {
'$lbl2' => t('Your password has been reset as requested.'),
'$lbl3' => t('Your new password is'),
'$lbl4' => t('Save or copy your new password - and then'),
'$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
'$lbl5' => '<a href="' . $a->get_baseurl() . '/login">' . t('click here to login') . '</a>.',
'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
'$newpass' => $new_password,
'$baseurl' => $a->get_baseurl()

2
mod/photos.php
View File

@ -463,7 +463,7 @@ function photos_post(&$a) {
$_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
}
$r = attach_store($a->channel,get_observer_hash(), '', $_REQUEST);
$r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
if(! $r['success']) {
notice($r['message'] . EOL);

1
util/shredder/JSON.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
# The MIT License
#
# Copyright (c) 2011 Dominic Tarr

2
version.inc
View File

@ -1 +1 @@
2016-01-20.1284H
2016-01-21.1285H

8
view/theme/redbasic/schema/bluegrid.css
View File

@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus {
color: rgba(255,255,255,.8);
}
.widget .conv-participants {
color: #BBB;
}
.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
color: inherit;
}
.help-block, .comment-icon, .jot-icons, .admin-icons {
color: inherit;
}

2
view/theme/redbasic/schema/dark.css
View File

@ -88,7 +88,7 @@
background-color: #111;
}
.jotnets-wrapper > a.btn {
a.btn, aside a {
font-weight: 400 !important;
}

4
view/theme/redbasic/schema/simple_black_on_white.css
View File

@ -75,6 +75,10 @@
background-color: #fff;
}
a.btn, aside a {
font-weight: 400 !important;
}
.btn-default {
background-color: #fff;
border-color: #000;

4
view/theme/redbasic/schema/simple_green_on_black.css
View File

@ -75,6 +75,10 @@
background-color: #000;
}
a.btn, aside a {
font-weight: 400 !important;
}
.btn-default {
background-color: #000;
border-color: #143D12;

4
view/theme/redbasic/schema/simple_white_on_black.css
View File

@ -71,6 +71,10 @@
background-color: #000;
}
a.btn, aside a {
font-weight: 400 !important;
}
.btn-default {
background-color: #000;
border-color: #fff;

2
view/tpl/removeaccount.tpl
View File

@ -10,7 +10,7 @@
<input type="hidden" name="verify" value="{{$hash}}" />
<div class="form-group" id="remove-account-pass-wrapper">
<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
</div>
{{include file="field_checkbox.tpl" field=$global}}
<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>

2
view/tpl/removeme.tpl
View File

@ -10,7 +10,7 @@
<input type="hidden" name="verify" value="{{$hash}}" />
<div class="form-group" id="remove-account-pass-wrapper">
<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
</div>
{{include file="field_checkbox.tpl" field=$global}}
<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>