Browse Source

Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php
tags/2.39
Alexander Kampmann 8 years ago
parent
commit
355c42cb30
100 changed files with 172 additions and 10 deletions
  1. +0
    -0
      .gitignore
  2. +0
    -0
      .htaccess
  3. +0
    -0
      INSTALL.txt
  4. +0
    -0
      LICENSE
  5. +82
    -8
      boot.php
  6. +8
    -2
      database.sql
  7. +0
    -0
      doc/Account-Basics.md
  8. +0
    -0
      doc/Bugs-and-Issues.md
  9. +0
    -0
      doc/Connectors.md
  10. +0
    -0
      doc/Developers.md
  11. +1
    -0
      doc/Home.md
  12. +0
    -0
      doc/Install.md
  13. +0
    -0
      doc/Installing-Connectors.md
  14. +0
    -0
      doc/Making-Friends.md
  15. +0
    -0
      doc/Message-Flow.md
  16. +0
    -0
      doc/Pages.md
  17. +0
    -0
      doc/Plugins.md
  18. +0
    -0
      doc/Profiles.md
  19. +0
    -0
      doc/Remove-Account.md
  20. +0
    -0
      doc/Settings.md
  21. +0
    -0
      doc/Tags-and-Mentions.md
  22. +24
    -0
      doc/andfinally.md
  23. +11
    -0
      doc/groupsandpages.md
  24. +13
    -0
      doc/guide.md
  25. +11
    -0
      doc/makingnewfriends.md
  26. +9
    -0
      doc/network.md
  27. +13
    -0
      doc/peopleyouknow.md
  28. +0
    -0
      htconfig.php
  29. +0
    -0
      images/article.gif
  30. +0
    -0
      images/audio.gif
  31. +0
    -0
      images/b_block.gif
  32. +0
    -0
      images/b_drop.gif
  33. +0
    -0
      images/b_drop.png
  34. +0
    -0
      images/b_drophide.gif
  35. +0
    -0
      images/b_dropshow.gif
  36. +0
    -0
      images/b_edit.gif
  37. +0
    -0
      images/b_edit.png
  38. BIN
      images/blank.png
  39. +0
    -0
      images/calendar.png
  40. +0
    -0
      images/camera-icon.gif
  41. +0
    -0
      images/connect-bg.png
  42. +0
    -0
      images/content-types.png
  43. +0
    -0
      images/default-group-mm.png
  44. +0
    -0
      images/default-profile-mm.jpg
  45. +0
    -0
      images/default-profile-sm.jpg
  46. +0
    -0
      images/default-profile.jpg
  47. +0
    -0
      images/diaspora.png
  48. +0
    -0
      images/dislike.gif
  49. +0
    -0
      images/document.gif
  50. +0
    -0
      images/ff-128.jpg
  51. +0
    -0
      images/ff-16.jpg
  52. +0
    -0
      images/ff-256.jpg
  53. +0
    -0
      images/ff-32.jpg
  54. +0
    -0
      images/ff-64.jpg
  55. +0
    -0
      images/ff.xcf
  56. +0
    -0
      images/friendica-128.jpg
  57. +0
    -0
      images/friendica-128.png
  58. +0
    -0
      images/friendica-16.jpg
  59. +0
    -0
      images/friendica-16.png
  60. +0
    -0
      images/friendica-1600.png
  61. +0
    -0
      images/friendica-256.jpg
  62. +0
    -0
      images/friendica-256.png
  63. +0
    -0
      images/friendica-32.jpg
  64. +0
    -0
      images/friendica-32.png
  65. +0
    -0
      images/friendica-48.png
  66. +0
    -0
      images/friendica-64.jpg
  67. +0
    -0
      images/friendica-64.png
  68. +0
    -0
      images/friendica-96.png
  69. +0
    -0
      images/friendica.svg
  70. +0
    -0
      images/friendika-128.jpg
  71. +0
    -0
      images/friendika-128.png
  72. +0
    -0
      images/friendika-16.jpg
  73. +0
    -0
      images/friendika-16.png
  74. +0
    -0
      images/friendika-1600.png
  75. +0
    -0
      images/friendika-256.jpg
  76. +0
    -0
      images/friendika-256.png
  77. +0
    -0
      images/friendika-32.jpg
  78. +0
    -0
      images/friendika-32.png
  79. +0
    -0
      images/friendika-48.png
  80. +0
    -0
      images/friendika-64.jpg
  81. +0
    -0
      images/friendika-64.png
  82. +0
    -0
      images/friendika-96.png
  83. +0
    -0
      images/friendika.svg
  84. +0
    -0
      images/globe.gif
  85. +0
    -0
      images/hide_off.png
  86. +0
    -0
      images/hide_on.png
  87. +0
    -0
      images/icons.png
  88. +0
    -0
      images/icons/10/add.png
  89. +0
    -0
      images/icons/10/delete.png
  90. +0
    -0
      images/icons/10/edit.png
  91. +0
    -0
      images/icons/10/feed.png
  92. +0
    -0
      images/icons/10/gear.png
  93. +0
    -0
      images/icons/10/group.png
  94. +0
    -0
      images/icons/10/info.png
  95. +0
    -0
      images/icons/10/link.png
  96. +0
    -0
      images/icons/10/lock.png
  97. +0
    -0
      images/icons/10/menu.png
  98. +0
    -0
      images/icons/10/notice.png
  99. +0
    -0
      images/icons/10/notify_off.png
  100. +0
    -0
      images/icons/10/notify_on.png

+ 0
- 0
.gitignore View File


+ 0
- 0
.htaccess View File


+ 0
- 0
INSTALL.txt View File


+ 0
- 0
LICENSE View File


+ 82
- 8
boot.php View File

@@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');

define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1288' );
define ( 'FRIENDICA_VERSION', '2.3.1302' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );
define ( 'DB_UPDATE_VERSION', 1135 );

define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -90,13 +90,14 @@ define ( 'PAGE_SOAPBOX', 1 );
define ( 'PAGE_COMMUNITY', 2 );
define ( 'PAGE_FREELOVE', 3 );
define ( 'PAGE_BLOG', 4 );
define ( 'PAGE_PRVGROUP', 5 );

/**
* Network and protocol family types
*/

define ( 'NETWORK_ZOT', 'zot!'); // Zot!
define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations
define ( 'NETWORK_ZOT', 'zot!'); // Zot!
define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations
define ( 'NETWORK_FEED', 'feed'); // RSS/Atom feeds with no known "post/notify" protocol
define ( 'NETWORK_DIASPORA', 'dspr'); // Diaspora
@@ -108,6 +109,28 @@ define ( 'NETWORK_XMPP', 'xmpp'); // XMPP
define ( 'NETWORK_MYSPACE', 'mysp'); // MySpace
define ( 'NETWORK_GPLUS', 'goog'); // Google+

/*
* These numbers are used in stored permissions
* and existing allocations MUST NEVER BE CHANGED
* OR RE-ASSIGNED! You may only add to them.
*/

$netgroup_ids = array(
NETWORK_DFRN => (-1),
NETWORK_ZOT => (-2),
NETWORK_OSTATUS => (-3),
NETWORK_FEED => (-4),
NETWORK_DIASPORA => (-5),
NETWORK_MAIL => (-6),
NETWORK_MAIL2 => (-7),
NETWORK_FACEBOOK => (-8),
NETWORK_LINKEDIN => (-9),
NETWORK_XMPP => (-10),
NETWORK_MYSPACE => (-11),
NETWORK_GPLUS => (-12),
);


/**
* Maximum number of "people who like (or don't like) this" that we will list by name
*/
@@ -135,6 +158,9 @@ define ( 'NOTIFY_PROFILE', 0x0040 );
define ( 'NOTIFY_TAGSELF', 0x0080 );
define ( 'NOTIFY_TAGSHARE', 0x0100 );

define ( 'NOTIFY_SYSTEM', 0x8000 );


/**
* various namespaces we may need to parse
*/
@@ -268,6 +294,8 @@ class App {
public $nav_sel;

public $category;

private $scheme;
private $hostname;
private $baseurl;
@@ -352,6 +380,9 @@ class App {
$this->argc = count($this->argv);
if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
$this->module = str_replace(".", "_", $this->argv[0]);
if(array_key_exists('2',$this->argv)) {
$this->category = $this->argv[2];
}
}
else {
$this->argc = 1;
@@ -560,6 +591,10 @@ function absurl($path) {
return $path;
}

function is_ajax() {
return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}


// Primarily involved with database upgrade, but also sets the
// base url for use in cmdline programs which don't have
@@ -955,6 +990,12 @@ function profile_sidebar($profile, $block = 0) {
if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
$connect = False;

if(get_my_url() && $profile['unkmail'])
$wallmessage = t('Message');
else
$wallmessage = false;



// show edit profile to yourself
if ($profile['uid'] == local_user()) {
@@ -1037,6 +1078,7 @@ function profile_sidebar($profile, $block = 0) {
$o .= replace_macros($tpl, array(
'$profile' => $profile,
'$connect' => $connect,
'$wallmessage' => $wallmessage,
'$location' => template_escape($location),
'$gender' => $gender,
'$pdesc' => $pdesc,
@@ -1232,17 +1274,20 @@ function current_theme(){
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css'))
if($theme_name &&
(file_exists('view/theme/' . $theme_name . '/style.css') ||
file_exists('view/theme/' . $theme_name . '/style.php')))
return($theme_name);
foreach($app_base_themes as $t) {
if(file_exists('view/theme/' . $t . '/style.css'))
if(file_exists('view/theme/' . $t . '/style.css')||
file_exists('view/theme/' . $t . '/style.php'))
return($t);
}
$fallback = glob('view/theme/*/style.css');
$fallback = glob('view/theme/*/style.[css|php]');
if(count($fallback))
return (str_replace('view/theme/','', str_replace("/style.css","",$fallback[0])));
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));

}}

@@ -1254,6 +1299,8 @@ if(! function_exists('current_theme_url')) {
function current_theme_url() {
global $a;
$t = current_theme();
if (file_exists('view/theme/' . $t . '/style.php'))
return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
}}

@@ -1279,8 +1326,12 @@ function feed_birthday($uid,$tz) {
*
*/

$birthday = '';

if(! strlen($tz))
$tz = 'UTC';

$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval($uid)
);
@@ -1378,6 +1429,29 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
);
}


$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
call_hooks('profile_tabs', $arr);
$tpl = get_markup_template('common_tabs.tpl');
return replace_macros($tpl,array('$tabs'=>$tabs));

return replace_macros($tpl,array('$tabs' => $arr['tabs']));
}}

function get_my_url() {
if(x($_SESSION,'my_url'))
return $_SESSION['my_url'];
return false;
}

function zrl($s) {
if(! strlen($s))
return $s;
if(! strpos($s,'/profile/'))
return $s;
$achar = strpos($s,'?') ? '&' : '?';
$mine = get_my_url();
if($mine and ! link_compare($mine,$s))
return $s . $achar . 'zrl=' . urlencode($mine);
return $s;
}

+ 8
- 2
database.sql View File

@@ -290,9 +290,10 @@ CREATE TABLE IF NOT EXISTS `mail` (
`convid` int(10) unsigned NOT NULL,
`title` char(255) NOT NULL,
`body` mediumtext NOT NULL,
`seen` tinyint(1) NOT NULL,
`seen` tinyint(1) NOT NULL DEFAULT '0',
`reply` tinyint(1) NOT NULL DEFAULT '0',
`replied` tinyint(1) NOT NULL,
`replied` tinyint(1) NOT NULL DEFAULT '0',
`unknown` tinyint(1) NOT NULL DEFAULT '0',
`uri` char(255) NOT NULL,
`parent-uri` char(255) NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -301,6 +302,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
KEY `guid` (`guid`),
KEY `convid` (`convid`),
KEY `reply` (`reply`),
KEY `unknown` (`unknown`),
KEY `uri` (`uri`),
KEY `parent-uri` (`parent-uri`),
KEY `created` (`created`)
@@ -454,6 +456,8 @@ CREATE TABLE IF NOT EXISTS `user` (
`blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0',
`hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0',
`blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0',
`unkmail` tinyint(1) unsigned NOT NULL DEFAULT '0',
`cntunkmail` int(11) unsigned NOT NULL DEFAULT '10',
`notify-flags` int(11) unsigned NOT NULL DEFAULT '65535',
`page-flags` int(11) unsigned NOT NULL DEFAULT '0',
`prvnets` tinyint(1) NOT NULL DEFAULT '0',
@@ -473,6 +477,8 @@ CREATE TABLE IF NOT EXISTS `user` (
KEY `account_expired` (`account_expired`),
KEY `hidewall` (`hidewall`),
KEY `blockwall` (`blockwall`),
KEY `unkmail` (`unkmail`),
KEY `cntunkmail` (`cntunkmail`),
KEY `blocked` (`blocked`),
KEY `verified` (`verified`),
KEY `login_date` (`login_date`)


+ 0
- 0
doc/Account-Basics.md View File


+ 0
- 0
doc/Bugs-and-Issues.md View File


+ 0
- 0
doc/Connectors.md View File


+ 0
- 0
doc/Developers.md View File


+ 1
- 0
doc/Home.md View File

@@ -5,6 +5,7 @@ Friendica Documentation and Resources
**Contents**

* [Account Basics](help/Account-Basics)
* [New User Quick Start](help/guide)
* [Profiles](help/Profiles)
* [Connectors](help/Connectors)
* [Making Friends](help/Making-Friends)


+ 0
- 0
doc/Install.md View File


+ 0
- 0
doc/Installing-Connectors.md View File


+ 0
- 0
doc/Making-Friends.md View File


+ 0
- 0
doc/Message-Flow.md View File


+ 0
- 0
doc/Pages.md View File


+ 0
- 0
doc/Plugins.md View File


+ 0
- 0
doc/Profiles.md View File


+ 0
- 0
doc/Remove-Account.md View File


+ 0
- 0
doc/Settings.md View File


+ 0
- 0
doc/Tags-and-Mentions.md View File


+ 24
- 0
doc/andfinally.md View File

@@ -0,0 +1,24 @@
And that brings the Quick Start to an end.

Here are some more things to help get you started:

**Groups**


- <a href = "https://kakste.com/profile/newhere">New Here</a> - a group for people new to Friendica

- <a href = "http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - problems? This is the place to ask.

- <a href = "https://kakste.com/profile/public_stream">Public Stream</a> - a place to talk about anything to anyone.

- <a href = "https://letstalk.pyxis.uberspace.de/profile/letstalk">Let's Talk</a> a group for finding people and groups who share similar interests.

- <a href = "http://newzot.hydra.uberspace.de/profile/newzot">Local Friendica</a> a page for local Friendica groups</a>


**Documentation**

- <a href = "/help/Connectors">Connecting to more networks</a>
- <a href = "/help">Help Index</a>



+ 11
- 0
doc/groupsandpages.md View File

@@ -0,0 +1,11 @@
This is the global directory. If you get lost, you can <a href = "/help/groupsandpages">click this link</a> to bring yourself back here.

On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people!

When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here.

Once you've added some groups, <a href = "/help/andfinally">move on to the next section</a>.

<iframe src="http://dir.friendica.com/directory/forum" width="950" height = "600"></iframe>



+ 13
- 0
doc/guide.md View File

@@ -0,0 +1,13 @@
First things first, let's make sure you're logged in to your account. If you're not already logged in, do so in the frame below.

Once you've logged in (or if you are already logged in), you'll now be looking at your profile page.

This is a bit like your Facebook wall. It's where all your status messgages are kept, and where your friends come to post on your wall. To write your status, simply click in the box that says "share". When you do this, the box will expand. You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures. At the bottom you'll find some more links. You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web. You can also set your post location here.

Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts.

Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href = "/help/network">Network Tab</a>

<iframe src="/login" width="950" height = "600"></iframe>



+ 11
- 0
doc/makingnewfriends.md View File

@@ -0,0 +1,11 @@
This is your Suggested Friends page. If you get lost, you can <a href = "/help/makenewfriends">click this link</a> to bring yourself back here.

This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too!

See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more.

Feel uncomfortable adding people you don't know? Don't worry - that's where <a href = "/help/groupsandpages">Groups and Pages</a> come in!

<iframe src="/suggest" width="950" height = "600"></iframe>



+ 9
- 0
doc/network.md View File

@@ -0,0 +1,9 @@
This is your Network Tab. If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.

This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.

Now we need to fill it up, the first step, is to <a href = "/help/peopleyouknow"> add people you already know from Facebook</a>.

<iframe src="/network" width="950" height = "600"></iframe>



+ 13
- 0
doc/peopleyouknow.md View File

@@ -0,0 +1,13 @@
This is your connector settings page. If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.

This is the bit that makes Friendica unique. You can connect to <i>anybody on the internet</i> from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages.

The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can <a href = "https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="new">fine tune this</a> or experiment with the other connectors too. If you need help, you can always ask at <a href = "http://helpers.pyxis.uberspace.de/profile/helpers" target="new">Friendica Support</a> or <a href = "/help/Connectors" target="new">see the instructions here</a>.

When you're ready, we can move on to <a href = "/help/makingnewfriends">making new friends</a>.



<iframe src="/settings/connectors" width="950" height = "600"></iframe>



+ 0
- 0
htconfig.php View File


+ 0
- 0
images/article.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 1.0 KiB Width: 16  |  Height: 16  |  Size: 1.0 KiB

+ 0
- 0
images/audio.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 559 B Width: 16  |  Height: 16  |  Size: 559 B

+ 0
- 0
images/b_block.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 83 B Width: 16  |  Height: 16  |  Size: 83 B

+ 0
- 0
images/b_drop.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 138 B Width: 16  |  Height: 16  |  Size: 138 B

+ 0
- 0
images/b_drop.png View File

Before After
Width: 16  |  Height: 16  |  Size: 311 B Width: 16  |  Height: 16  |  Size: 311 B

+ 0
- 0
images/b_drophide.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 111 B Width: 16  |  Height: 16  |  Size: 111 B

+ 0
- 0
images/b_dropshow.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 138 B Width: 16  |  Height: 16  |  Size: 138 B

+ 0
- 0
images/b_edit.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 311 B Width: 16  |  Height: 16  |  Size: 311 B

+ 0
- 0
images/b_edit.png View File

Before After
Width: 16  |  Height: 16  |  Size: 451 B Width: 16  |  Height: 16  |  Size: 451 B

BIN
images/blank.png View File

Before After
Width: 640  |  Height: 400  |  Size: 1.3 KiB

+ 0
- 0
images/calendar.png View File

Before After
Width: 16  |  Height: 16  |  Size: 853 B Width: 16  |  Height: 16  |  Size: 853 B

+ 0
- 0
images/camera-icon.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 1015 B Width: 16  |  Height: 16  |  Size: 1015 B

+ 0
- 0
images/connect-bg.png View File

Before After
Width: 27  |  Height: 21  |  Size: 689 B Width: 27  |  Height: 21  |  Size: 689 B

+ 0
- 0
images/content-types.png View File

Before After
Width: 100  |  Height: 23  |  Size: 3.8 KiB Width: 100  |  Height: 23  |  Size: 3.8 KiB

+ 0
- 0
images/default-group-mm.png View File

Before After
Width: 22  |  Height: 22  |  Size: 598 B Width: 22  |  Height: 22  |  Size: 598 B

+ 0
- 0
images/default-profile-mm.jpg View File

Before After
Width: 48  |  Height: 48  |  Size: 322 B Width: 48  |  Height: 48  |  Size: 322 B

+ 0
- 0
images/default-profile-sm.jpg View File

Before After
Width: 80  |  Height: 80  |  Size: 346 B Width: 80  |  Height: 80  |  Size: 346 B

+ 0
- 0
images/default-profile.jpg View File

Before After
Width: 175  |  Height: 175  |  Size: 490 B Width: 175  |  Height: 175  |  Size: 490 B

+ 0
- 0
images/diaspora.png View File

Before After
Width: 16  |  Height: 16  |  Size: 461 B Width: 16  |  Height: 16  |  Size: 461 B

+ 0
- 0
images/dislike.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 119 B Width: 16  |  Height: 16  |  Size: 119 B

+ 0
- 0
images/document.gif View File

Before After
Width: 32  |  Height: 32  |  Size: 1.3 KiB Width: 32  |  Height: 32  |  Size: 1.3 KiB

+ 0
- 0
images/ff-128.jpg View File

Before After
Width: 128  |  Height: 128  |  Size: 4.4 KiB Width: 128  |  Height: 128  |  Size: 4.4 KiB

+ 0
- 0
images/ff-16.jpg View File

Before After
Width: 16  |  Height: 16  |  Size: 644 B Width: 16  |  Height: 16  |  Size: 644 B

+ 0
- 0
images/ff-256.jpg View File

Before After
Width: 256  |  Height: 256  |  Size: 2.7 KiB Width: 256  |  Height: 256  |  Size: 2.7 KiB

+ 0
- 0
images/ff-32.jpg View File

Before After
Width: 32  |  Height: 32  |  Size: 1.6 KiB Width: 32  |  Height: 32  |  Size: 1.6 KiB

+ 0
- 0
images/ff-64.jpg View File

Before After
Width: 64  |  Height: 64  |  Size: 2.8 KiB Width: 64  |  Height: 64  |  Size: 2.8 KiB

+ 0
- 0
images/ff.xcf View File


+ 0
- 0
images/friendica-128.jpg View File

Before After
Width: 128  |  Height: 128  |  Size: 8.2 KiB Width: 128  |  Height: 128  |  Size: 8.2 KiB

+ 0
- 0
images/friendica-128.png View File

Before After
Width: 128  |  Height: 128  |  Size: 6.3 KiB Width: 128  |  Height: 128  |  Size: 6.3 KiB

+ 0
- 0
images/friendica-16.jpg View File

Before After
Width: 16  |  Height: 16  |  Size: 659 B Width: 16  |  Height: 16  |  Size: 659 B

+ 0
- 0
images/friendica-16.png View File

Before After
Width: 16  |  Height: 16  |  Size: 756 B Width: 16  |  Height: 16  |  Size: 756 B

+ 0
- 0
images/friendica-1600.png View File

Before After
Width: 1600  |  Height: 1600  |  Size: 280 KiB Width: 1600  |  Height: 1600  |  Size: 280 KiB

+ 0
- 0
images/friendica-256.jpg View File

Before After
Width: 256  |  Height: 256  |  Size: 17 KiB Width: 256  |  Height: 256  |  Size: 17 KiB

+ 0
- 0
images/friendica-256.png View File

Before After
Width: 256  |  Height: 256  |  Size: 10 KiB Width: 256  |  Height: 256  |  Size: 10 KiB

+ 0
- 0
images/friendica-32.jpg View File

Before After
Width: 32  |  Height: 32  |  Size: 1.5 KiB Width: 32  |  Height: 32  |  Size: 1.5 KiB

+ 0
- 0
images/friendica-32.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.6 KiB Width: 32  |  Height: 32  |  Size: 1.6 KiB

+ 0
- 0
images/friendica-48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 2.3 KiB Width: 48  |  Height: 48  |  Size: 2.3 KiB

+ 0
- 0
images/friendica-64.jpg View File

Before After
Width: 64  |  Height: 64  |  Size: 3.4 KiB Width: 64  |  Height: 64  |  Size: 3.4 KiB

+ 0
- 0
images/friendica-64.png View File

Before After
Width: 64  |  Height: 64  |  Size: 3.2 KiB Width: 64  |  Height: 64  |  Size: 3.2 KiB

+ 0
- 0
images/friendica-96.png View File

Before After
Width: 96  |  Height: 96  |  Size: 5.4 KiB Width: 96  |  Height: 96  |  Size: 5.4 KiB

+ 0
- 0
images/friendica.svg View File


+ 0
- 0
images/friendika-128.jpg View File

Before After
Width: 128  |  Height: 128  |  Size: 8.2 KiB Width: 128  |  Height: 128  |  Size: 8.2 KiB

+ 0
- 0
images/friendika-128.png View File

Before After
Width: 128  |  Height: 128  |  Size: 6.3 KiB Width: 128  |  Height: 128  |  Size: 6.3 KiB

+ 0
- 0
images/friendika-16.jpg View File

Before After
Width: 16  |  Height: 16  |  Size: 659 B Width: 16  |  Height: 16  |  Size: 659 B

+ 0
- 0
images/friendika-16.png View File

Before After
Width: 16  |  Height: 16  |  Size: 756 B Width: 16  |  Height: 16  |  Size: 756 B

+ 0
- 0
images/friendika-1600.png View File

Before After
Width: 1600  |  Height: 1600  |  Size: 280 KiB Width: 1600  |  Height: 1600  |  Size: 280 KiB

+ 0
- 0
images/friendika-256.jpg View File

Before After
Width: 256  |  Height: 256  |  Size: 17 KiB Width: 256  |  Height: 256  |  Size: 17 KiB

+ 0
- 0
images/friendika-256.png View File

Before After
Width: 256  |  Height: 256  |  Size: 10 KiB Width: 256  |  Height: 256  |  Size: 10 KiB

+ 0
- 0
images/friendika-32.jpg View File

Before After
Width: 32  |  Height: 32  |  Size: 1.5 KiB Width: 32  |  Height: 32  |  Size: 1.5 KiB

+ 0
- 0
images/friendika-32.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.6 KiB Width: 32  |  Height: 32  |  Size: 1.6 KiB

+ 0
- 0
images/friendika-48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 2.3 KiB Width: 48  |  Height: 48  |  Size: 2.3 KiB

+ 0
- 0
images/friendika-64.jpg View File

Before After
Width: 64  |  Height: 64  |  Size: 3.4 KiB Width: 64  |  Height: 64  |  Size: 3.4 KiB

+ 0
- 0
images/friendika-64.png View File

Before After
Width: 64  |  Height: 64  |  Size: 3.2 KiB Width: 64  |  Height: 64  |  Size: 3.2 KiB

+ 0
- 0
images/friendika-96.png View File

Before After
Width: 96  |  Height: 96  |  Size: 5.4 KiB Width: 96  |  Height: 96  |  Size: 5.4 KiB

+ 0
- 0
images/friendika.svg View File


+ 0
- 0
images/globe.gif View File

Before After
Width: 16  |  Height: 16  |  Size: 1.0 KiB Width: 16  |  Height: 16  |  Size: 1.0 KiB

+ 0
- 0
images/hide_off.png View File

Before After
Width: 6  |  Height: 6  |  Size: 281 B Width: 6  |  Height: 6  |  Size: 281 B

+ 0
- 0
images/hide_on.png View File

Before After
Width: 6  |  Height: 6  |  Size: 277 B Width: 6  |  Height: 6  |  Size: 277 B

+ 0
- 0
images/icons.png View File

Before After
Width: 160  |  Height: 68  |  Size: 12 KiB Width: 160  |  Height: 68  |  Size: 12 KiB

+ 0
- 0
images/icons/10/add.png View File

Before After
Width: 10  |  Height: 10  |  Size: 2.9 KiB Width: 10  |  Height: 10  |  Size: 2.9 KiB

+ 0
- 0
images/icons/10/delete.png View File

Before After
Width: 10  |  Height: 10  |  Size: 2.9 KiB Width: 10  |  Height: 10  |  Size: 2.9 KiB

+ 0
- 0
images/icons/10/edit.png View File

Before After
Width: 10  |  Height: 10  |  Size: 2.9 KiB Width: 10  |  Height: 10  |  Size: 2.9 KiB

+ 0
- 0
images/icons/10/feed.png View File

Before After
Width: 10  |  Height: 10  |  Size: 535 B Width: 10  |  Height: 10  |  Size: 535 B

+ 0
- 0
images/icons/10/gear.png View File

Before After
Width: 10  |  Height: 10  |  Size: 3.0 KiB Width: 10  |  Height: 10  |  Size: 3.0 KiB

+ 0
- 0
images/icons/10/group.png View File

Before After
Width: 10  |  Height: 10  |  Size: 543 B Width: 10  |  Height: 10  |  Size: 543 B

+ 0
- 0
images/icons/10/info.png View File

Before After
Width: 10  |  Height: 10  |  Size: 488 B Width: 10  |  Height: 10  |  Size: 488 B

+ 0
- 0
images/icons/10/link.png View File

Before After
Width: 10  |  Height: 10  |  Size: 410 B Width: 10  |  Height: 10  |  Size: 410 B

+ 0
- 0
images/icons/10/lock.png View File

Before After
Width: 10  |  Height: 10  |  Size: 463 B Width: 10  |  Height: 10  |  Size: 463 B

+ 0
- 0
images/icons/10/menu.png View File

Before After
Width: 10  |  Height: 10  |  Size: 2.9 KiB Width: 10  |  Height: 10  |  Size: 2.9 KiB

+ 0
- 0
images/icons/10/notice.png View File

Before After
Width: 10  |  Height: 10  |  Size: 471 B Width: 10  |  Height: 10  |  Size: 471 B

+ 0
- 0
images/icons/10/notify_off.png View File

Before After
Width: 10  |  Height: 10  |  Size: 478 B Width: 10  |  Height: 10  |  Size: 478 B

+ 0
- 0
images/icons/10/notify_on.png View File

Before After
Width: 10  |  Height: 10  |  Size: 369 B Width: 10  |  Height: 10  |  Size: 369 B

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save