Commit graph

16 commits

Author SHA1 Message Date
redmatrix
b4cbb3aeb1 update history 2015-08-31 17:45:01 -07:00
redmatrix
2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	doc/history.md
	mod/import.php
2015-08-11 22:35:36 -07:00
redmatrix
d882b3274b doc fixes 2015-08-11 22:32:53 -07:00
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
bb67ab1fbf this brings us up to date 2015-01-06 15:30:54 -08:00
zottel
8ddf16f1ee add main_footer include to all .md files except TOS and README 2014-12-08 11:06:37 +01:00
friendica
226d695525 make it a bit personal 2014-11-12 23:55:04 -08:00
friendica
1c1705e060 ok, I think I'll give it a break now. 2014-11-12 19:43:54 -08:00
friendica
a77abb0694 minor word tweaks 2014-11-12 19:04:24 -08:00
friendica
634475164e wordsmith 2014-11-12 16:11:18 -08:00
friendica
9478fd7fd4 more minor wordsmithing 2014-11-12 16:04:49 -08:00
friendica
f41c748fe2 Some dates couldn't be verified without going way back in the archives so at least make this document accurate based on what I have in front of me. 2014-11-12 15:47:29 -08:00
friendica
4e7567ffa2 History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff. 2014-11-12 15:31:24 -08:00