strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-09-27 01:00:31 -07:00
commit 069a76bff4
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Developers.md
View file

@ -7,7 +7,7 @@ doing development.
Create your own github account. Create your own github account.
You may fork/clone the Friendika repository from [https://github.com/friendika/friendika.git](https://github.com/friendika/friendika.git). You may fork/clone the Friendika repository from [https://github.com/friendika/Free-Friendika.git](https://github.com/friendika/Free-Friendika.git).
Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/)
to create and use your own tracking fork on github to create and use your own tracking fork on github

18
doc/Install.md
View file

@ -36,13 +36,27 @@ you might have trouble getting everything to work.]
- If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be
`git clone http://github.com/friendika/friendika.git mywebsite` `git clone https://github.com/friendika/Free-Friendika.git mywebsite`
and then you can pick up the latest changes at any time with - and then you can pick up the latest changes at any time with
`git pull` `git pull`
- For installing addons
- First you should be **on** your website folder
`cd mywebsite`
- Then you should clone the addon repository (separtely)
`git clone https://github.com/friendika/friendika-addons.git addon`
- For keeping the addon tree updated, you should be on you addon tree and issue a git pull
`cd mywebsite/addon`
`git pull`
- If you copy the directory tree to your webserver, make sure - If you copy the directory tree to your webserver, make sure
that you also copy .htaccess - as "dot" files are often hidden that you also copy .htaccess - as "dot" files are often hidden