Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: search with leading @ performs directory search (# for tag search), nothing for text search Darkzero-NS + 'Friendicaland' countries. set comment permissions explicitly to parent permissions * master:
This commit is contained in:
Simon L'nu
commit
18d4cf0583
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1346' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1347' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1144 );
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
//
|
||||
var gLngMaxStateLength=0;
|
||||
var gLngMaxCountryLength=0;
|
||||
var gLngNumberCountries=252;
|
||||
var gLngNumberCountries=253;
|
||||
var gLngNumberStates=0;
|
||||
var gLngSelectedCountry=0;
|
||||
var gLngSelectedState=0;
|
||||
|
|
@ -17,7 +17,7 @@ var gArCountryInfo;
|
|||
var gArStateInfo;
|
||||
// NOTE:
|
||||
// Some editors may exhibit problems viewing 2803 characters...
|
||||
var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe";
|
||||
var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe|Friendicaland"
|
||||
var aStates = new Array();
|
||||
|
||||
aStates[0]="";
|
||||
|
|
@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
|
|||
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
|
||||
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
|
||||
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
|
||||
|
||||
aStates[253]="Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Oradons Friendica|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
|
||||
/*
|
||||
* gArCountryInfo
|
||||
* (0) Country name
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ function dirfind_init(&$a) {
|
|||
function dirfind_content(&$a) {
|
||||
|
||||
$search = notags(trim($_REQUEST['search']));
|
||||
|
||||
if(strpos($search,'@') === 0)
|
||||
$search = substr($search,1);
|
||||
|
||||
$o = '';
|
||||
|
||||
|
|
|
|||
19
mod/item.php
19
mod/item.php
|
|
@ -218,14 +218,23 @@ function item_post(&$a) {
|
|||
|
||||
$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
|
||||
|
||||
if(($parent_item) &&
|
||||
(($parent_item['private'])
|
||||
// If this is a comment, set the permissions from the parent.
|
||||
|
||||
if($parent_item) {
|
||||
$private = 0;
|
||||
|
||||
if(($parent_item['private'])
|
||||
|| strlen($parent_item['allow_cid'])
|
||||
|| strlen($parent_item['allow_gid'])
|
||||
|| strlen($parent_item['deny_cid'])
|
||||
|| strlen($parent_item['deny_gid'])
|
||||
)) {
|
||||
$private = 1;
|
||||
|| strlen($parent_item['deny_gid'])) {
|
||||
$private = 1;
|
||||
}
|
||||
|
||||
$str_contact_allow = $parent_item['allow_cid'];
|
||||
$str_group_allow = $parent_item['allow_gid'];
|
||||
$str_contact_deny = $parent_item['deny_cid'];
|
||||
$str_group_deny = $parent_item['deny_gid'];
|
||||
}
|
||||
|
||||
$pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ function search_content(&$a) {
|
|||
|
||||
$o = '<div id="live-search"></div>' . "\r\n";
|
||||
|
||||
$o .= '<h3>' . t('Search This Site') . '</h3>';
|
||||
$o .= '<h3>' . t('Search') . '</h3>';
|
||||
|
||||
if(x($a->data,'search'))
|
||||
$search = notags(trim($a->data['search']));
|
||||
|
|
@ -101,6 +101,10 @@ function search_content(&$a) {
|
|||
$tag = true;
|
||||
$search = substr($search,1);
|
||||
}
|
||||
if(strpos($search,'@') === 0) {
|
||||
require_once('mod/dirfind.php');
|
||||
return dirfind_content($a);
|
||||
}
|
||||
|
||||
if(! $search)
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1346\n"
|
||||
"Project-Id-Version: 3.0.1347\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-05-18 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-05-19 10:00-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"
|
||||
|
|
@ -577,7 +577,7 @@ msgstr ""
|
|||
msgid "Community"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/community.php:61 ../../mod/search.php:128
|
||||
#: ../../mod/community.php:61 ../../mod/search.php:134
|
||||
msgid "No results."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1691,7 +1691,8 @@ msgstr ""
|
|||
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
|
||||
#: ../../addon/facebook/facebook.php:688
|
||||
#: ../../addon/facebook/facebook.php:1178
|
||||
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2738
|
||||
#: ../../addon/public_server/public_server.php:62
|
||||
#: ../../addon/testdrive/testdrive.php:61 ../../include/items.php:2738
|
||||
#: ../../boot.php:696
|
||||
msgid "Administrator"
|
||||
msgstr ""
|
||||
|
|
@ -3833,6 +3834,11 @@ msgstr ""
|
|||
msgid "%1$s changed %2$s to “%3$s”"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:332
|
||||
#, php-format
|
||||
msgid " - Visit %1$s's %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:335
|
||||
#, php-format
|
||||
msgid "%1$s has an updated %2$s, changing %3$s."
|
||||
|
|
@ -4857,6 +4863,25 @@ msgstr ""
|
|||
msgid "Enable Geonames Plugin"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/public_server/public_server.php:126
|
||||
#: ../../addon/testdrive/testdrive.php:88
|
||||
#, php-format
|
||||
msgid "Your account on %s will expire in a few days."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/public_server/public_server.php:127
|
||||
msgid "Your Friendica account is about to expire."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/public_server/public_server.php:128
|
||||
#, php-format
|
||||
msgid ""
|
||||
"Hi %1$s,\n"
|
||||
"\n"
|
||||
"Your account on %2$s will expire in less than five days. You may keep your "
|
||||
"account by logging in at least once every 30 days"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/js_upload/js_upload.php:43
|
||||
msgid "Upload a file"
|
||||
msgstr ""
|
||||
|
|
@ -5116,16 +5141,11 @@ msgstr ""
|
|||
msgid "Gravatar settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/testdrive/testdrive.php:85
|
||||
#, php-format
|
||||
msgid "Your account on %s will expire in a few days."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/testdrive/testdrive.php:86
|
||||
#: ../../addon/testdrive/testdrive.php:89
|
||||
msgid "Your Friendica test account is about to expire."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/testdrive/testdrive.php:87
|
||||
#: ../../addon/testdrive/testdrive.php:90
|
||||
#, php-format
|
||||
msgid ""
|
||||
"Hi %1$s,\n"
|
||||
|
|
@ -6201,12 +6221,12 @@ msgstr ""
|
|||
msgid "Finishes:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/delivery.php:452 ../../include/notifier.php:652
|
||||
#: ../../include/delivery.php:455 ../../include/notifier.php:659
|
||||
msgid "(no subject)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/delivery.php:459 ../../include/enotify.php:23
|
||||
#: ../../include/notifier.php:659
|
||||
#: ../../include/delivery.php:462 ../../include/enotify.php:23
|
||||
#: ../../include/notifier.php:666
|
||||
msgid "noreply"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,14 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
|
|||
|
||||
nav #banner #logo-text a { color: #ffffff; }
|
||||
|
||||
.wall-item-content-wrapper { border: 1px solid #444444; }
|
||||
.wall-item-content-wrapper {
|
||||
border: 1px solid #444444;
|
||||
background: #444;
|
||||
|
||||
}
|
||||
.wall-item-tools { background-color: #444444; background-image: none;}
|
||||
.comment-edit-wrapper{ background-color: #333333; }
|
||||
.comment-wwedit-wrapper{ background-color: #333333; }
|
||||
.comment-edit-preview{ color: #000000; }
|
||||
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
|
||||
.photo-top-album-name{ background-color: #333333; }
|
||||
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
|
||||
|
|
@ -75,25 +80,77 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
|
||||
#jot-title {
|
||||
#jot-title, #jot-category {
|
||||
background-color: #333333;
|
||||
border: 1px solid #333333;
|
||||
}
|
||||
|
||||
#jot-title::-webkit-input-placeholder{ color: #555555!important;}
|
||||
#jot-title:-moz-placeholder{color: #555555!important;}
|
||||
#jot-category::-webkit-input-placeholder{ color: #555555!important;}
|
||||
#jot-category:-moz-placeholder{color: #555555!important;}
|
||||
|
||||
|
||||
#jot-title:hover,
|
||||
#jot-title:focus {
|
||||
#jot-title:focus,
|
||||
#jot-category:hover,
|
||||
#jot-category:focus {
|
||||
border: 1px solid #cccccc;
|
||||
}
|
||||
|
||||
.wall-item-content {
|
||||
max-height: 20000px;
|
||||
overflow: none;
|
||||
}
|
||||
blockquote {
|
||||
background: #ddd;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
|
||||
color: #eec;
|
||||
}
|
||||
|
||||
input#acl-search {
|
||||
background-color: #aaa;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.notify-seen {
|
||||
background:#666;
|
||||
}
|
||||
|
||||
#nav-notifications-menu {
|
||||
background: #2e2e2f;
|
||||
}
|
||||
|
||||
#nav-notifications-menu li:hover {
|
||||
background: #444;
|
||||
}
|
||||
|
||||
.acpopupitem{
|
||||
background:#2e2f2e;
|
||||
}
|
||||
|
||||
code {
|
||||
background:#2e2f2e !important;
|
||||
color:#fff !important;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
background:#2e2f2e !important;
|
||||
color:#eec !important;
|
||||
}
|
||||
|
||||
.group-selected, .nets-selected, .fileas-selected, .categories-selected {
|
||||
background:#2e2f2e;
|
||||
}
|
||||
|
||||
#fancybox-content{
|
||||
background:#444;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.wall-item-content {
|
||||
max-height: 20000px;
|
||||
overflow: none;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user