Commit Graph

163 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 a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
Klaus Weidenbach da6eecd031 remove Doxygen API Documentation from repository.
This removes around 14MB and can get easily generate locally by
doxygen util/Doxyfile when needed.
Restructured .gitignore a bit and some additions like zotshrc, etc.
Fixed a typo in doc/main.bb
2015-03-04 11:38:35 +01:00
friendica 2a74fab21a weekly doxygen push 2015-02-27 13:41:41 -08:00
friendica ff5c3b009f doc update 2015-02-20 00:15:30 -08:00
friendica ccf1a131f1 doc update 2015-02-20 00:15:03 -08:00
friendica 9ba21f82cb missing file 2015-02-15 16:30:41 -08:00
friendica 7bb2e25ea0 missing param 2015-02-13 13:04:31 -08:00
friendica 8840980797 more doc updates 2015-02-06 02:07:52 -08:00
friendica 7edab47658 get_rel_link broken - also weekly doc updates 2015-02-06 02:07:10 -08:00
friendica 340212d77e sync_locations() toggle DB flag functions were broken - result of postgres changes. Split these into seperate set and reset blocks. 2015-01-30 15:01:10 -08:00
friendica ab0706521e let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates 2015-01-30 13:45:28 -08:00
friendica e157371c39 remote_user => remote_channel 2015-01-28 20:58:59 -08:00
friendica a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
Christian Vogeley ba10833bc5 Check allowed emails, also add blacklisting for
not allowed emails:
config:'system','not_allowed_email'
2015-01-25 04:16:28 +01:00
friendica 0cdcc4bc50 doc updates 2015-01-23 03:25:17 -08:00
friendica 2016342cf2 more doc updates 2015-01-16 00:53:55 -08:00
friendica 8f8700ddd2 mod_prep usability enhancements, doc updates 2015-01-16 00:53:04 -08:00
Christian Vogeley 1e6fd90795 Correction 2015-01-11 22:59:50 +01:00
Christian Vogeley f6ec519686 Correction 2015-01-11 22:54:16 +01:00
Christian Vogeley f245a09023 Correction 2015-01-11 22:36:30 +01:00
Christian Vogeley 4e7e555a75 corrcetion 2015-01-11 22:30:59 +01:00
Christian Vogeley 63f189b453 Correct 2015-01-11 22:23:30 +01:00
Christian Vogeley f0c7612bcd Merge remote-tracking branch 'upstream/master'
Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js
2015-01-11 16:22:59 +01:00
friendica c75cdbd304 doc updates 2015-01-10 13:04:43 -08:00
friendica ed2917118d doc updates 2015-01-02 17:26:57 -08:00
Andrew Manning c49b521884 Added url tag around image for inserted links 2014-12-30 16:16:57 -06:00
Christian Vogeley 4a0150026b merge 2014-12-27 22:37:10 +01:00
friendica 7ba92feabf doc update 2014-12-26 00:13:22 -08:00
friendica 26105b53d4 doc updates 2014-12-19 00:29:10 -08:00
friendica d3465802d6 doc update 2014-12-12 00:28:05 -08:00
friendica 452d275b5e don't import to sys channel from self-censored authors 2014-12-12 00:26:07 -08:00
friendica 7f1a42340a Merge https://github.com/friendica/red into pending_merge 2014-12-10 16:26:36 -08:00
friendica 58067c24fc block adult channels from inclusion in public content feeds 2014-12-10 16:24:31 -08:00
Christian Vogeley f3789b1aeb merge 2014-12-07 16:09:03 +01:00
Christian Vogeley 098eb66ba0 merge 2014-12-07 16:07:34 +01:00
friendica af3bf10d2f doc updates 2014-11-28 18:47:59 -08:00
Andrew Manning d89d4630d0 Documentation wording
Improved wording. Replaced white colored text with black because the
default theme makes the white invisible.
2014-11-25 06:46:06 -05:00
friendica c785b5a90c doc updates 2014-11-22 12:25:49 -08:00
friendica 87cdfc1751 doc updates 2014-11-15 14:03:28 -08:00
friendica d17c15a992 doc updates 2014-11-07 05:14:53 -08:00
friendica e32a339a3d doc updates 2014-11-01 00:36:01 -07:00
friendica 7f0bd5a6e5 doc updates 2014-10-31 05:05:31 -07:00
friendica 5ede7bd654 doc updates 2014-10-24 04:16:45 -07:00
friendica 88d63d1b77 new doc added to doc checkin 2014-10-19 15:55:22 -07:00
friendica 478e7c4479 doc updates 2014-10-19 15:54:51 -07:00
friendica 8e7e488ffe doc updates 2014-10-10 00:13:00 -07:00
friendica f5623ae11d doc updates 2014-10-03 03:34:50 -07:00
friendica 1e7fbac6c1 doc updates, clean up buttons on PM edit template to match other edit buttons 2014-09-26 01:52:30 -07:00