diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index b5e757dbc..164a6be46 100755
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -6,7 +6,9 @@ Account Basics
**Registration**
-Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page.
+Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs.
+
+If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
*OpenID*
@@ -14,11 +16,11 @@ The first field on the Registration page is for an OpenID address. If you do not
*Your Full Name*
-Please provide your full name as you would like it to be displayed on this system.
+Please provide your full name **as you would like it to be displayed on this system**. Most people use their real name for this, but you're under no obligation to do so yourself.
*Email Address*
-Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.
+Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in. This doesn't have to be your primary email address, but it does need to be a real email address. You can't get your initial password, or reset a lost password later without it. This is the only bit of personal information that has to be accurate.
*Nickname*
@@ -28,12 +30,12 @@ A nickname is used to generate web addresses for many of your personal pages, an
*Directory Publishing*
-The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login.
-
+The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login.
*Register*
-Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval.
+Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password.
+
@@ -58,6 +60,11 @@ After your first login, please visit the 'Settings' page from the top menu bar a
A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information.
+**Retrieving Personal Data**
+
+You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings page.
+
+
**See Also**
* [Profiles](help/Profiles)
@@ -66,4 +73,3 @@ A ['Tips for New Members'](newmember) link will show up on your home page for tw
* [Remove Account](help/Remove-Account)
-
\ No newline at end of file
diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index c119b9968..46abea9a3 100755
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -4,18 +4,19 @@ Bugs and Issues
* [Home](help)
-Please report any bugs/issues you encounter using our bug tracker at [[http://bugs.friendica.com]]
+If your server has a support page, you should report any bugs/issues you encounter there first. Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them, and that helps us get new features faster.
-Try to provide as much information as you can about the bug (including the full text of any error messages or notices), and if possible your Friendica version.
+If you're a technical user, or your site doesn't have a support page, you'll need to use the Bug Tracker. Please perform a search to see if there's already an open bug that matches yours before submitting anything.
-Your Friendica version may be found in newer releases by visiting http://YOURFRIENDICASITE/friendica
+Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible. It's generally better to provide too much information than not enough.
-For older versions, view the HTML source of your profile page. The Friendica version is in the HTML header, 5-10 lines from the top of the page.
+See this article to learn more about submitting **good** bug reports.
-For really old versions which don't have a version number in the HTML header - please upgrade. Your bug was probably fixed a long time ago.
**Bug Sponsorship**
+If you find a bug, and it is caused by a problem in main branch (ie, is not specific to our site), you may sponsor it.
+
The bug/issue database allows you to sponsor issues. This provides an incentive for developers to work on your issue. This isn't necessary - we don't like bugs and will try to fix them. This has more importance for future development projects and feature requests.
Bug sponsorship works on the honour system. If you agree to pay $10 to fix a bug, when the fix has been checked in and verified you should send a paypal payment to the developer assigned to the bug. Don't ever think you can get away with not paying a developer for work performed. Some of these guys could hack into your credit card account if you make them mad.
diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md
index 1a9c8d898..3f1a24c8d 100755
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -5,7 +5,13 @@ Making Friends
Friendship in Friendica can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody. How do you do it?
-The first thing you can do is look at the Directory for somebody you would like to connect with. Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
+The easiest thing to do is to join the New Here group. This group is especially for people new to the Friendica network. Simply connect to the group, post to the wall, and make new friends. You don't even have to like us - comment on a few of our posts, and other people will start to add you too.
+
+The next thing you can do is look at the Directory. The directory is split up into two parts. If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server. You'll also see a link to the Global Directory. If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica. You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages. You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually.
+
+To connect with other Friendica user
+
+Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
Click that. It will take you to a "Connect" form.
@@ -23,6 +29,7 @@ When you've submitted the connection page, it will take you back to your own sit
If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
+
**Alternate Networks**
You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks. (Or you can put in the URL to Bob's identi.ca page if you wish). You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendica. You can do the same for Twitter accounts and Diaspora accounts. In fact you can "follow" most anybody or any website that produces a syndication feed (RSS/Atom,etc.). If we can find an information stream and a name to attach to the contact, we'll try to connect with them.
diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md
index f526b78a8..ae5de2cb6 100755
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@@ -5,9 +5,20 @@ Remove Account
We don't like to see people leave Friendica, but if you need to remove your account, you should visit the URL
-http://friendica-site/removeme
+http://sitename/removeme
-with your web browser. You will need to be logged in at the time. (Replace "friendica-site" with the hostname of your Friendica server)
+with your web browser. You will need to be logged in at the time.
You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be removed. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. Your user details, your conversations, your photos, your friends - everything; will be removed immediately and you will be logged out.
+When we expire posts we send notifications out to Friendica to remove the posts. Diaspora doesn't have a bulk delete so this step is skipped on that network - and hopefully it will be obvious that deletion doesn't work on any other networks. If you manually delete a post or a range of posts we send individual delete notifications to Friendica and Diaspora for each deleted post.
+
+Diaspora often loses these.
+
+If you delete a post but somebody else has starred it, it is still removed. Your wishes take priority.
+
+When you remove your account we physically remove all your posts and your profile and user data, etc. immediately.
+
+In order to send out a bulk remove we would need to keep your account around to do this, as we would need to prove to your friends who it is that is submitting the request. We can't do this if you don't have an account.
+
+Your friends may still see your posts if your account is gone, but there is no public place within Friendica where they can be viewed. If you had friends on Diaspora, your public posts may stick around and be visible to others from that network.
diff --git a/images/beard.jpg b/images/beard.jpg
new file mode 100644
index 000000000..d65e0c33b
Binary files /dev/null and b/images/beard.jpg differ
diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg
new file mode 100644
index 000000000..363eba6a5
Binary files /dev/null and b/images/whitebeard.jpg differ
diff --git a/include/nav.php b/include/nav.php
index 511ca07fc..aadfa82fd 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -122,6 +122,9 @@ function nav(&$a) {
}
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+ $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
+ $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
+ $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
if(is_array($a->identities) && count($a->identities) > 1) {
$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
diff --git a/include/text.php b/include/text.php
old mode 100755
new mode 100644
index c8c03174e..e7c95d35c
--- a/include/text.php
+++ b/include/text.php
@@ -738,6 +738,9 @@ function smilies($s, $sample = false) {
'~friendika',
'~friendica',
// 'Diaspora*'
+ ':beard',
+ ':whitebeard'
+
);
$icons = array(
@@ -779,7 +782,8 @@ function smilies($s, $sample = false) {
'~friendika  . '/images/friendika-16.png)
',
'~friendica  . '/images/friendica-16.png)
',
// 'Diaspora . '/images/diaspora.png)
',
-
+ ' . '/images/beard.jpg)
',
+ ' . '/images/whitebeard.jpg)
'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
diff --git a/mod/search.php b/mod/search.php
index fe09b671f..386592ea1 100755
--- a/mod/search.php
+++ b/mod/search.php
@@ -127,7 +127,7 @@ function search_content(&$a) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
- AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 )
+ AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$search_alg
diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
Binary files /dev/null and b/view/theme/diabook/icons/ftdevs.gif differ
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
new file mode 100755
index 000000000..0e7f7ae6a
Binary files /dev/null and b/view/theme/diabook/icons/scroll_top.png differ
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 1f2f64f6a..3a36e7daa 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -25,7 +25,7 @@
$nav.contacts.1
@@ -38,9 +38,9 @@
{{ endif }}
@@ -138,18 +138,11 @@
+
$langselector
-
+
-$nav.login.1
-
-
-
-
-
{#
{{ if $nav.logout }}$nav.logout.1 {{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index ddbbc2e53..fe1d3d882 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -619,6 +619,7 @@ nav .nav-menu-search {
margin: 3px 17px;
margin-right: 0px;
height: 17px;
+ width: 205px;
}
nav .nav-menu-icon {
@@ -856,7 +857,7 @@ aside {
/* background: #F1F1F1; */
}
aside .vcard .fn {
- font-size: 16px;
+ font-size: 18px;
font-weight: bold;
margin-bottom: 5px;
}
@@ -1427,12 +1428,13 @@ section {
margin-top: 10px;
}
#profile-jot-form #jot-title {
- border: 0px;
- margin: 0px;
- height: 20px;
- width: 700px;
- font-weight: bold;
- border: 1px solid #ffffff;
+
+ border-radius: 5px 5px 5px 5px;
+ font-weight: bold;
+ height: 20px;
+ margin: 0 0 5px;
+ width: 60%;
+ border: 1px solid #ffffff;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
@@ -1883,7 +1885,12 @@ blockquote {
padding-left: 9px;
margin: 0 0 0 .8ex;
}
-
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+ color: #666666;
+ margin: 15px 0 5px;
+ padding-left: 5px;
+ }
/* ================== */
/* = Contacts Block = */
/* ================== */
