aboutsummaryrefslogtreecommitdiffstats
path: root/doc/history.md
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-111-9/+9
|\ | | | | | | | | | | Conflicts: doc/history.md mod/import.php
| * doc fixesredmatrix2015-08-111-8/+8
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-131-8/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * remove project name dependency from most of the doc files to ease project ↵redmatrix2015-05-131-7/+7
| | | | | | | | merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
* | second pass name changeredmatrix2015-05-051-1/+1
| |
* | first pass name changeredmatrix2015-05-051-6/+6
|/
* this brings us up to datefriendica2015-01-061-1/+1
|
* add main_footer include to all .md files except TOS and READMEzottel2014-12-081-2/+1
|
* make it a bit personalfriendica2014-11-121-3/+3
|
* ok, I think I'll give it a break now.friendica2014-11-121-6/+8
|
* minor word tweaksfriendica2014-11-121-3/+3
|
* wordsmithfriendica2014-11-121-1/+1
|
* more minor wordsmithingfriendica2014-11-121-2/+2
|
* Some dates couldn't be verified without going way back in the archives so at ↵friendica2014-11-121-3/+3
| | | | least make this document accurate based on what I have in front of me.
* History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff.friendica2014-11-121-0/+48