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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-07-13 19:59:30 -07:00
commit 88bb61018d
5 changed files with 449 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -48,9 +48,8 @@ require_once('include/xchan.php');
require_once('include/hubloc.php');
require_once('include/attach.php');
define ( 'PLATFORM_NAME', 'red' );
define ( 'STD_VERSION', '5.3.1' );
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '2.5.8' );
define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1192 );

10
install/update.php
View File

@ -2548,6 +2548,13 @@ function update_r1190() {
}
function update_r1191() {
$r = q("SELECT 1 FROM principals LIMIT 1");
if($r !== false) {
return UPDATE_SUCCESS;
}
else {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("CREATE TABLE addressbooks (
id SERIAL NOT NULL,
@ -2955,4 +2962,7 @@ function update_r1191() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
}
}

94
util/hmessages.po
View File

@ -1,14 +1,14 @@
# red
# Copyright (C) 2012-2016 red
# This file is distributed under the same license as the red package.
# hubzilla
# Copyright (C) 2012-2016 hubzilla
# This file is distributed under the same license as the hubzilla package.
# Mike Macgirvin, 2012
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 5.3.1\n"
"Project-Id-Version: 2.5.8\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-05 20:52-0700\n"
"POT-Creation-Date: 2017-07-05 21:45-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -583,7 +583,7 @@ msgid "Membership on this site is by invitation only."
msgstr ""
#: ../../Zotlabs/Module/Register.php:268 ../../include/nav.php:147
#: ../../boot.php:1573
#: ../../boot.php:1572
msgid "Register"
msgstr ""
@ -880,7 +880,7 @@ msgstr ""
#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100
#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1596
#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1595
msgid "No"
msgstr ""
@ -943,7 +943,7 @@ msgstr ""
#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100
#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1596
#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1595
msgid "Yes"
msgstr ""
@ -978,8 +978,8 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Oauth.php:87
#: ../../Zotlabs/Module/Settings/Account.php:118
#: ../../Zotlabs/Module/Settings/Channel.php:476
#: ../../Zotlabs/Module/Settings/Featured.php:50
#: ../../Zotlabs/Module/Settings/Display.php:203
#: ../../Zotlabs/Module/Settings/Featured.php:52
#: ../../Zotlabs/Module/Settings/Tokens.php:168
#: ../../Zotlabs/Module/Settings/Permcats.php:110
#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
@ -5443,7 +5443,7 @@ msgid ""
"Password reset failed."
msgstr ""
#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1600
#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1599
msgid "Password Reset"
msgstr ""
@ -6590,6 +6590,30 @@ msgstr ""
msgid "Start calendar week on Monday"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:20
msgid "Affinity Slider settings updated."
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:34
msgid "No feature settings configured"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:41
msgid "Default maximum affinity level"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:46
msgid "Default minimum affinity level"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:50
msgid "Affinity Slider Settings"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:60
msgid "Feature/Addon Settings"
msgstr ""
#: ../../Zotlabs/Module/Settings/Display.php:145
msgid "No special theme for mobile devices"
msgstr ""
@ -6703,30 +6727,6 @@ msgstr ""
msgid "Grid page max height of content (in pixels)"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:21
msgid "Affinity Slider settings updated."
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:36
msgid "No feature settings configured"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:43
msgid "Default maximum affinity level"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:48
msgid "Default minimum affinity level"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:52
msgid "Affinity Slider Settings"
msgstr ""
#: ../../Zotlabs/Module/Settings/Featured.php:62
msgid "Feature/Addon Settings"
msgstr ""
#: ../../Zotlabs/Module/Settings/Tokens.php:31
#, php-format
msgid "This channel is limited to %d tokens"
@ -7894,7 +7894,7 @@ msgid "Suggest Channels"
msgstr ""
#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:115
#: ../../boot.php:1592
#: ../../boot.php:1591
msgid "Login"
msgstr ""
@ -11251,7 +11251,7 @@ msgstr ""
msgid "YYYY-MM-DD or MM-DD"
msgstr ""
#: ../../include/datetime.php:286 ../../boot.php:2420
#: ../../include/datetime.php:286 ../../boot.php:2419
msgid "never"
msgstr ""
@ -11683,7 +11683,7 @@ msgstr ""
msgid "Click to authenticate to your home hub"
msgstr ""
#: ../../include/nav.php:101 ../../include/nav.php:125 ../../boot.php:1591
#: ../../include/nav.php:101 ../../include/nav.php:125 ../../boot.php:1590
msgid "Logout"
msgstr ""
@ -13350,44 +13350,44 @@ msgstr ""
msgid "Set size of followup author photos"
msgstr ""
#: ../../boot.php:1572
#: ../../boot.php:1571
msgid "Create an account to access services and applications"
msgstr ""
#: ../../boot.php:1594
#: ../../boot.php:1593
msgid "Login/Email"
msgstr ""
#: ../../boot.php:1595
#: ../../boot.php:1594
msgid "Password"
msgstr ""
#: ../../boot.php:1596
#: ../../boot.php:1595
msgid "Remember me"
msgstr ""
#: ../../boot.php:1599
#: ../../boot.php:1598
msgid "Forgot your password?"
msgstr ""
#: ../../boot.php:2137
#: ../../boot.php:2136
msgid "toggle mobile"
msgstr ""
#: ../../boot.php:2290
#: ../../boot.php:2289
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr ""
#: ../../boot.php:2295
#: ../../boot.php:2294
msgid "Website SSL certificate is not valid. Please correct."
msgstr ""
#: ../../boot.php:2414
#: ../../boot.php:2413
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr ""
#: ../../boot.php:2419
#: ../../boot.php:2418
msgid "Cron/Scheduled tasks not running."
msgstr ""

6
view/css/conversation.css
View File

@ -77,7 +77,7 @@
/* conv_item */
.wall-item-head-new {
border-top: 0.2rem solid #0275d8;
border-top: 0.2rem solid #007bff;
}
.wall-item-info {
@ -168,11 +168,11 @@ a.wall-item-name-link {
}
.ivoted {
color: #0275d8;
color: #007bff;
}
.item-highlight {
border-left: 0.2rem solid #0275d8;
border-left: 0.2rem solid #007bff;
}
.item-highlight .wall-item-head,

2
view/theme/redbasic/php/style.php
View File

@ -80,7 +80,7 @@ if (! $nav_icon_colour)
if (! $nav_active_icon_colour)
$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
if (! $link_colour)
$link_colour = '#0275d8';
$link_colour = '#007bff';
if (! $banner_colour)
$banner_colour = '#fff';
if (! $bgcolour)