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

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

Browse Source
This commit is contained in:
friendica 2014-02-25 14:13:26 -08:00
commit 8fd12eb122
7 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/home.html
View File

@ -26,8 +26,8 @@ header { z-index: 10000; }
<div style="margin-top: 50px;"></div>
<center>
<div style="color:#808080;font-weight:bold;font-size:4.0em; margin-bottom: 15px;">Dream it. Do it.</div>
<img style="width: 175px; margin-bottom: 45px;" src="assets/logo_antiprism.png" >
<div style="color:#808080;font-weight:bold;font-size:4.0em; margin-bottom:75px;">Dream it. Do it.</div>
<img style="width: 450px; margin-bottom: 95px;" src="assets/logo_simplifiedap.png" >
</center>
<div class="tr">
<div class="td">Communications</div>

BIN
assets/logo_antiprism.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
assets/logo_simplifiedap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
assets/redmatrixlogo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 103 KiB

2
boot.php
View File

@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1098 );
define ( 'DB_UPDATE_VERSION', 1099 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

24
install/database.sql
View File

@ -160,18 +160,18 @@ CREATE TABLE IF NOT EXISTS `channel` (
`channel_allow_gid` mediumtext NOT NULL,
`channel_deny_cid` mediumtext NOT NULL,
`channel_deny_gid` mediumtext NOT NULL,
`channel_r_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_r_profile` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_r_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_r_abook` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_wall` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_tagwall` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_comment` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_mail` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_w_chat` tinyint(3) unsigned NOT NULL DEFAULT '128',
`channel_a_delegate` tinyint(3) unsigned NOT NULL DEFAULT '0',
`channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128',
`channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128',
`channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128',
`channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128',
`channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
`channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128',
`channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128',

22
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1098 );
define( 'UPDATE_VERSION' , 1099 );
/**
*
@ -1099,4 +1099,22 @@ function update_r1097() {
}
return UPDATE_SUCCESS;
}
}
function update_r1098() {
$r = q("ALTER TABLE `channel` CHANGE `channel_r_stream` `channel_r_stream` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r2 = q("ALTER TABLE `channel` CHANGE `channel_r_profile` `channel_r_profile` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r3 = q("ALTER TABLE `channel` CHANGE `channel_r_photos` `channel_r_photos` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r4 = q("ALTER TABLE `channel` CHANGE `channel_r_abook` `channel_r_abook` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r4 = q("ALTER TABLE `channel` CHANGE `channel_w_stream` `channel_w_stream` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r5 = q("ALTER TABLE `channel` CHANGE `channel_w_wall` `channel_w_wall` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r6 = q("ALTER TABLE `channel` CHANGE `channel_w_tagwall` `channel_w_tagwall` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r7 = q("ALTER TABLE `channel` CHANGE `channel_w_comment` `channel_w_comment` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r8 = q("ALTER TABLE `channel` CHANGE `channel_w_mail` `channel_w_mail` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r9 = q("ALTER TABLE `channel` CHANGE `channel_w_photos` `channel_w_photos` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r10 = q("ALTER TABLE `channel` CHANGE `channel_w_chat` `channel_w_chat` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
$r11 = q("ALTER TABLE `channel` CHANGE `channel_a_delegate` `channel_a_delegate` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
if($r && $r2 && $r3 && $r3 && $r5 && $r6 && $r7 && $r8 && $r9 && $r9 && $r10 && $r11)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}