Commit graph

14 commits

Author SHA1 Message Date
redmatrix
135d84ba37 several "to-do" updates 2016-06-09 19:06:31 -07:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
redmatrix
9495d2c701 indicate where progress has been made 2015-07-20 17:13:47 -07:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
002be8f9ce project updates 2015-06-26 16:37:55 -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
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
friendica
149a588b11 ensure we have permission before displaying buttons 2015-02-10 20:21:54 -08:00
friendica
c694945245 like formatting for extended consensus items 2015-02-09 21:18:50 -08:00
friendica
c1290861db roadmap update 2015-01-25 14:24:07 -08:00
friendica
6d0e6b78b4 update V3 roadmap 2015-01-21 14:25:45 -08:00
friendica
746e4860fa more roadmap 2014-11-23 15:09:07 -08:00
friendica
d191e7c348 project roadmap 2014-11-23 14:51:04 -08:00