Redesign prototype merge #18

Merged
MrPetovan merged 50 commits from feature/redesign-prototype into master 2017-05-06 08:10:18 +02:00
2 changed files with 6 additions and 0 deletions
Showing only changes of commit 735ca9d6fa - Show all commits

View file

@ -0,0 +1,5 @@
--
-- Sync targets to poulate the development directory
--
INSERT INTO `friendica_dir`.`sync-targets` (`base_url`, `pull`, `push`, `dt_last_pull`) VALUES ('dir.friendica.com', 1, 0, '');
INSERT INTO `friendica_dir`.`sync-targets` (`base_url`, `pull`, `push`, `dt_last_pull`) VALUES ('dir.friendi.ca', 1, 0, '');

View file

@ -70,6 +70,7 @@ cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
echo "create database friendica_dir" | mysql -u root -proot
# import test database
$MYSQL -uroot -proot friendica_dir < /vagrant/dfrndir.sql
$MYSQL -uroot -proot friendica_dir < /vagrant/util/vagrant_default_sync_servers.sql
#Install composer
cd /vagrant