MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

Browse source
This commit is contained in:
Michael Vogel 2015-02-03 20:08:47 +01:00
parent 226b551c85 11fd20fdc2
commit b27d6f1a82
5 changed files with 2403 additions and 580 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/Vagrant.md
View file

@ -3,6 +3,8 @@ Vagrant for Friendica Developers
* [Home](help) * [Home](help)
**Getting started**
[Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers. No need to setup up a webserver, database etc. before actually starting. Vagrant creates a virtual machine (an Ubuntu 12.04) for you that you can just run inside VirtualBox and start to work directly on Friendica. What you need to do: [Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers. No need to setup up a webserver, database etc. before actually starting. Vagrant creates a virtual machine (an Ubuntu 12.04) for you that you can just run inside VirtualBox and start to work directly on Friendica. What you need to do:
1. Install VirtualBox and vagrant. 1. Install VirtualBox and vagrant.
@ -20,4 +22,18 @@ If you want to stop vagrant after finishing your work, run the following command
in the development directory. in the development directory.
**Import test data**
If you want some test data in your vagrant Friendica instance import the database dump friendica_test_data.sql like so (inside the VM):
$> mysql -u root -p friendica < /vagrant/friendica_test_data.sql
You will then have the following accounts to login:
* admin, password admin
* friendica1, password friendica
* friendica2, password friendica2 and so on until friendica5
* friendica1 is connected to all others. friendica1 has two groups: group1 with friendica2 and friendica4, group2 with friendica3 and friendica5.
* friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected.
For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/). For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).

1787
friendica_test_data.sql Normal file
View file

File diff suppressed because one or more lines are too long

1170
util/messages.po
View file

File diff suppressed because it is too large Load diff

4
util/vagrant_provision.sh
View file

@ -67,8 +67,8 @@ service mysql restart
#add Friendica accounts for local user accounts, use email address like vagrant@friendica.dev, read the email with 'mail'. #add Friendica accounts for local user accounts, use email address like vagrant@friendica.dev, read the email with 'mail'.
debconf-set-selections <<< "postfix postfix/mailname string friendica.dev" debconf-set-selections <<< "postfix postfix/mailname string friendica.dev"
debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'" debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'"
apt-get install -y postfix sudo apt-get install -y postfix mailutils libmailutils-dev
apt-get install mailutils sudo echo -e "friendica1: vagrant\nfriendica2: vagrant\nfriendica3: vagrant\nfriendica4: vagrant\nfriendica5: vagrant" >> /etc/aliases && sudo newaliases
#make the vagrant directory the docroot #make the vagrant directory the docroot
sudo rm -rf /var/www/ sudo rm -rf /var/www/

6
view/theme/diabook/theme.php
View file

@ -408,7 +408,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}} }}
// last 12 users // last 12 users
if($close_lastusers != "1") { if(($close_lastusers != "1") AND !get_config('diabook','disable_features')) {
$aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array(); $aside['$lastusers_items'] = array();
$sql_extra = ""; $sql_extra = "";
@ -437,7 +437,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}} }}
// last 10 liked items // last 10 liked items
if($close_lastlikes != "1") { if(($close_lastlikes != "1") AND !get_config('diabook','disable_features')) {
$aside['$like_title'] = t('Last likes'); $aside['$like_title'] = t('Last likes');
$aside['$like_items'] = array(); $aside['$like_items'] = array();
$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
@ -482,7 +482,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}} }}
// last 12 photos // last 12 photos
if($close_lastphotos != "1") { if(($close_lastphotos != "1") AND !get_config('diabook','disable_features')) {
$aside['$photos_title'] = t('Last photos'); $aside['$photos_title'] = t('Last photos');
$aside['$photos_items'] = array(); $aside['$photos_items'] = array();
$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM