mirror of
https://github.com/friendica/friendica
synced 2024-10-11 07:04:33 +02:00
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
This commit is contained in:
commit
bc6e5a4f2d
52
CHANGELOG
52
CHANGELOG
|
@ -1,3 +1,55 @@
|
|||
Version 3.4.1
|
||||
|
||||
Implement server-to-server encryption (RINO) using php-encryption library as "RINO 2", deprecate "RINO 1" (issue #1655) (fabrixxm)
|
||||
Fix connection with Diaspora "freelove" account (issue #1572) (annando)
|
||||
Various SQL speedups (annando)
|
||||
Port of Javascript DatePicker input from RedMatrix (rabuzarus)
|
||||
Port of RedMatrix archive widget (rabuzarus)
|
||||
Load profile owner settings for theme on profile page (rabuzarus)
|
||||
Move HTML code from php into templates (rabuzarus)
|
||||
Theme "frost": add event with doubleclick, event preview (rabuzarus)
|
||||
Delete attachments on item deletion, delete videos from video tab (issue #1574) (fabrixxm)
|
||||
Improvements with reshared Diaspora items (annando)
|
||||
Improvements in OStatus communications: (annando)
|
||||
improve duplicate handling
|
||||
publish comments to post to all PuSH subscribers
|
||||
use correct contact when automatically add @-replies
|
||||
add attachment links as enclosures
|
||||
send salmon notifications to every mentioned person
|
||||
better thread completition
|
||||
support for bookmarks
|
||||
support for events and questions
|
||||
link to items using GUID
|
||||
Fix warning in mod/photo (issue #1638) (rabuzarus)
|
||||
New option to block public access to local directory and poco
|
||||
Fix parsing bbcode [url] tag with fragment identifier (issue #1514) (fabrixxm)
|
||||
Fix HTML for oembeds (issue #1612) (fabrixxm)
|
||||
Add fake fields to API response for better Twitter API compatibility (annando)
|
||||
Fix search in local directory (issue #1657) (annando)
|
||||
Improve OEmbed (issue #1640) (annando)
|
||||
Fix double html encodig in site administration page for sitename and register text (issue #1628) (annando)
|
||||
Fix remote subscription from GNU Social (annando)
|
||||
Fix "{0}" in notifications (issue #1642) (annando)
|
||||
Fix desktop notification (fabrixxm)
|
||||
Fix rewrite test in install wizard with self-signed certificate (annando)
|
||||
Better support for non standard installations of GNU Social (annando)
|
||||
Fix emoticons alt text (tobias)
|
||||
Improve threaded display in Vier theme (annando)
|
||||
Use field templates in photo edit form (fabrixxm)
|
||||
Alllow deletion of any user but yourself (issue #1625) (fabrixxm)
|
||||
Install wizard load htconfig template from template/ folder, remove localized htconfig templates (fabrixxm)
|
||||
Add contact detail to non-js contact drop confirm dialog (issue #1629) (fabrixxm)
|
||||
Return geo coord in API (annando)
|
||||
Improve events reminder: use title, show in colorbox, link using event ID (rabuzarus)
|
||||
Fix spelling in accepted connection notification email (strk)
|
||||
Show image size warning in a human readable format (rabuzarus)
|
||||
Move ACL window in template (rabuzarus)
|
||||
New option "-s" in util/run_xgettext.sh (fabrixxm)
|
||||
Support, but ignore at the moment, delete message from Quitter (annando)
|
||||
Remove google maps from core. Functionality moved to addon "googlemap" alongside "openstreetmap" (issue #1705) (annando)
|
||||
Update to German documentation (Frank Dieckmann, tobias)
|
||||
Updated translations (translation teams, tobias)
|
||||
|
||||
Version 3.4
|
||||
|
||||
Optionally, "like" and "dislike" activities don't update thread timestamp (annando)
|
||||
|
|
15
boot.php
15
boot.php
|
@ -17,7 +17,7 @@ require_once('include/dbstructure.php');
|
|||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_CODENAME', 'Lily of the valley');
|
||||
define ( 'FRIENDICA_VERSION', '3.4.0' );
|
||||
define ( 'FRIENDICA_VERSION', '3.4.1' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1185 );
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
|
@ -1476,17 +1476,20 @@ if(! function_exists('current_theme')) {
|
|||
|
||||
if($is_mobile) {
|
||||
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
|
||||
$system_theme = '';
|
||||
$theme_name = '';
|
||||
$system_theme = $standard_system_theme;
|
||||
$theme_name = $standard_theme_name;
|
||||
}
|
||||
else {
|
||||
$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
|
||||
$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : $standard_system_theme);
|
||||
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
|
||||
|
||||
if($theme_name === '---') {
|
||||
// user has selected to have the mobile theme be the same as the normal one
|
||||
$system_theme = '';
|
||||
$theme_name = '';
|
||||
$system_theme = $standard_system_theme;
|
||||
$theme_name = $standard_theme_name;
|
||||
|
||||
if($page_theme)
|
||||
$theme_name = $page_theme;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ function bookmarklet_content(&$a) {
|
|||
'nickname' => $a->user['nickname'],
|
||||
'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
|
||||
'default_perms' => get_acl_permissions($a->user),
|
||||
'acl' => populate_acl($a->user),
|
||||
'acl' => populate_acl($a->user,true),
|
||||
'bang' => '',
|
||||
'visitor' => 'block',
|
||||
'profile_uid' => local_user(),
|
||||
|
|
12725
view/de/messages.po
12725
view/de/messages.po
File diff suppressed because it is too large
Load diff
2561
view/de/strings.php
2561
view/de/strings.php
File diff suppressed because it is too large
Load diff
12755
view/it/messages.po
12755
view/it/messages.po
File diff suppressed because it is too large
Load diff
2561
view/it/strings.php
2561
view/it/strings.php
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue