From f661bb42509366c9677eac8c18476d594d652e80 Mon Sep 17 00:00:00 2001 From: zottel Date: Thu, 8 Dec 2011 00:12:51 -0800 Subject: [PATCH 1/6] fixed some glitches in testbubble theme --- view/theme/testbubble/style.css | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 1830a74086..d1d344ef97 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -65,6 +65,8 @@ li { .required { display: inline; color: #b20202; } .fakelink { color: #b20202; cursor: pointer; } .fakelink :hover { color: #db0503; } +.heart { color: #FF0000; font-size: 100%; } + input[type=text] { border: 2px solid #b0b0b0; @@ -2279,18 +2281,27 @@ margin-left: 0px; padding: 5px; } -#register-form div, -#profile-edit-form div { +#register-form div { clear: both; } +#profile-edit-form div { + margin-bottom: 5px; +} + +#profile-edit-form div[id$='desc'] { + font-size: 0.8em; + margin-left: 2%; +} + #register-form label, #profile-edit-form label { width: 300px; float: left; } -#register-form span, -#profile-edit-form span { +/* #register-form span, +#profile-edit-form span { */ +#register-form span { color: #555753; display:block; margin-bottom: 20px; From 5b3155579ad58c16daa6a3c7c69d53482357c506 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 9 Dec 2011 16:46:18 -0800 Subject: [PATCH 2/6] fix diaspora's illegal webfinger xml before sending to parser --- include/network.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/network.php b/include/network.php index 78ed240743..551d5e1d0f 100644 --- a/include/network.php +++ b/include/network.php @@ -535,6 +535,9 @@ function fetch_xrd_links($url) { if ((! $xml) || (! stristr($xml,''),array('href="','"/>'),$xml); + $h = parse_xml_string($xml); if(! $h) return array(); From 727661d454dc6012b4f00e860748a0b5df4b067f Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 9 Dec 2011 16:48:15 -0800 Subject: [PATCH 3/6] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index bd7dfa8e44..c447609309 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1188' ); +define ( 'FRIENDICA_VERSION', '2.3.1190' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1111 ); From 102ea901c3de0b8dec707dc01464bfb79f250df0 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 9 Dec 2011 16:50:13 -0800 Subject: [PATCH 4/6] cannot register at all when multiple_pages is not allowed --- mod/register.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/register.php b/mod/register.php index 6ebe35dbfd..0115ec0d58 100644 --- a/mod/register.php +++ b/mod/register.php @@ -452,7 +452,12 @@ function register_content(&$a) { $block = get_config('system','block_extended_register'); - if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) { + if(local_user() && ($block)) { + notice("Permission denied." . EOL); + return; + } + + if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { notice("Permission denied." . EOL); return; } From acdc7ca05af929aba99e5e54015e454c287c0980 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 10 Dec 2011 01:50:37 -0800 Subject: [PATCH 5/6] typo in db sql --- database.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database.sql b/database.sql index 1d57b9c6c6..894ea42d98 100644 --- a/database.sql +++ b/database.sql @@ -115,7 +115,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( KEY `dfrn-id` (`dfrn-id`), KEY `blocked` (`blocked`), KEY `readonly` (`readonly`), - KET `hidden` (`hidden`), + KEY `hidden` (`hidden`), KEY `pending` (`pending`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; From 834639ebab3daded63c3ed076273e69b798ced90 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 11 Dec 2011 16:58:36 -0800 Subject: [PATCH 6/6] \o/ smiley --- boot.php | 2 +- images/smiley-thumbsup.gif | Bin 0 -> 1350 bytes include/text.php | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 images/smiley-thumbsup.gif diff --git a/boot.php b/boot.php index c447609309..8452108ff1 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1190' ); +define ( 'FRIENDICA_VERSION', '2.3.1192' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1111 ); diff --git a/images/smiley-thumbsup.gif b/images/smiley-thumbsup.gif new file mode 100644 index 0000000000000000000000000000000000000000..a9533a64d26a92f01796d72f47de06bdbea9c732 GIT binary patch literal 1350 zcmWlYdo+{@07rk{H-jN8rH76!N-xg{JI>IMFh-g2Y7{jkp<*>2Wo0UPLNYZJQAm@P0lumI9lK8{&mm&|GK)lFl`SRVkt%`m_V0_wXP%#wc(&f zSZUK8m%?r(TvuSjI#}p~qet#shmcipG=%qBco>kZ&DdfFw~eH&F}52M?wi5i1gKQcTJ zwTFoHB}IG5ct89cKxTN8;=PCtK&(H)590KGL?41!h{zxu4MCC+i9*_mP~t)$P6s0; z7>S`s4<>$zKujdcgOC}HoG`@2ATJC_(I`2Ngp;@!jhsj#JBD^Y9K|P)6^qPRdfrL= zCL)s0AWe+o7!<@JFCN#=LY#`ML|i*h=AT2+S(KkeZZfLGkR&OUrlax_Zd}8&OZ2`Z zlwU>V74lgoo@e0q>*&bDlV4GK2hF)k(pyAp9%^nAjW?Aa70{n7#@nbVLVE#PiqTm} zYbrxqDXpgnf0g3JeY8j*twi^Iypf=#8l9EIG=qAAnWyM)!&C!7)nlX; zpIR{74n?za-z&V65uaY7tqZ+xF!2(Da?HNO2RZ(GfiXE|USmRzx80y*%6+{U>A~2d z%Q4)C-a$}ZnC`>Bi!y-uL3|y?!VqRgK#gMLGv>$eb&8}WF+GD1^Tfm)7H0940!2{< zb96!t-#=L7`x9U+fKt`tNQT&kY}w7bhb0D$HiqiV0WX?I#eoNQ8b(dc!^x(H8Rf+C zl3|^l&Al;~u1DzFc*eCds?t2V#qUFxu`#_R z>tab+dxKHR#Ta){0liMstYLGM;IfBng68Up{^+Ru%ln3IH+& zzCSy;z(V0vA-upvCsZQ}(e;;%$n@5{R7YkjOA4>C_J#+X(eH3Wf zCSTD>`?y=d(|Y{qPZirn$wOxd^9_=hHqqZVv$xMae66jiN^jhBR-)jkwdy6dtU98X zO$U{wleh6G;F7 literal 0 HcmV?d00001 diff --git a/include/text.php b/include/text.php index 29e53c6635..04d5dfcedf 100644 --- a/include/text.php +++ b/include/text.php @@ -674,7 +674,7 @@ function smilies($s) { $a = get_app(); $s = str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', '~friendika', '~friendica', 'Diaspora*' ), array( '<3', @@ -693,6 +693,7 @@ function smilies($s) { ':-D', '8-|', '8-O', + '\\o/', '~friendika ~friendika', '~friendica ~friendica', 'DiasporaDiaspora*',