Commit graph

16 commits

Author SHA1 Message Date
redmatrix
51b89f0ed8 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/DerivedTheme1.md
	doc/Developers.md
	doc/Features.md
	doc/Plugins.md
	doc/Privacy.md
	doc/README.md
	doc/Remove-Account.md
	doc/Translations.md
	doc/about.bb
	doc/account_basics.bb
	doc/accounts_profiles_channels_basics.bb
	doc/addons.bb
	doc/addons_gnusocial.bb
	doc/bbcode.html
	doc/campaign.bb
	doc/classRedmatrix_1_1Import_1_1Import-members.html
	doc/classRedmatrix_1_1Import_1_1Import.html
	doc/cloud.bb
	doc/connecting_to_channels.bb
	doc/connecting_to_channels.md
	doc/credits.bb
	doc/de/channels.bb
	doc/de/features.bb
	doc/de/main.bb
	doc/de/registration.bb
	doc/developers.bb
	doc/encryption.bb
	doc/external-resource-links.bb
	doc/extra_features.bb
	doc/faq_admins.bb
	doc/faq_developers.bb
	doc/faq_members.bb
	doc/features.bb
	doc/hidden_configs.bb
	doc/history.md
	doc/html/index.php
	doc/main.bb
	doc/permissions.bb
	doc/plugins.bb
	doc/problems-following-an-update.bb
	doc/profiles.bb
	doc/red2pi.bb
	doc/registration.bb
	doc/roadmap.bb
	doc/sv/main.bb
	doc/what_is_zot.bb
	doc/zot.md
2015-05-13 19:23:13 -07:00
redmatrix
364025e550 remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. 2015-05-13 17:59:45 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
friendica
d599ebe742 update resource links 2015-04-01 15:52:02 -07:00
zottel
8ddf16f1ee add main_footer include to all .md files except TOS and README 2014-12-08 11:06:37 +01:00
friendica
ac23a1bfa2 put translate README into help docs 2013-10-18 15:57:10 -07:00
friendica
9cb3a44177 add code-style guidelines. These aren't laws or rules, they are guidelines. 2013-10-15 16:52:57 -07:00
friendica
3354abfd42 add -C cfgfile option to shred to allow multiple configurations. I just added the option for multiple configs, I didn't make it work as it requires quite a bit of change to the shred program flow; which tries to load the default config before doing anything at all. 2013-09-17 01:31:46 -07:00
Tazman DeVille
6c308a2d72 fixed link to wiki 2013-09-17 04:52:36 +02:00
Thomas Willingham
96fa691f8a Doco 2013-05-14 19:14:30 +01:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Friendika
6d507a840a some doc updates 2011-11-08 14:12:01 -08:00
Abinoam P. Marques Jr.
e20ba2c271 Changing git url for Free-Friendika 2011-09-26 23:45:08 -03:00
Friendika
767f165965 local documentation library 2011-04-13 07:07:21 -07:00