aboutsummaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-191-0/+1
|\ | | | | | | | | Conflicts: include/api.php
| * update to_doredmatrix2015-08-181-0/+1
| |
* | 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
| |
* | remove the forum limitredmatrix2015-08-111-1/+1
| |
* | bring back colour to abook_self in aclredmatrix2015-08-111-3/+3
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix0.8redmatrix2015-08-061-2/+2
|\|
| * closing tagsredmatrix2015-08-061-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-212-17/+21
|\| | | | | | | | | Conflicts: doc/to_do_code.bb
| * indicate where progress has been maderedmatrix2015-07-202-16/+20
| |
* | incorrectly named doc fileredmatrix2015-07-061-0/+0
| |
* | more work on db storage of docoredmatrix2015-07-051-1/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-1/+0
|\| | | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php
| * update German main help filezottel2015-07-031-1/+0
| |
* | start doco cleanupredmatrix2015-07-0363-62/+62
| |
* | sync abook entries from redmatrixredmatrix2015-07-024-35/+1
|\| | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
| * Clean upThomas Willingham2015-06-304-35/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-282-1/+4
|\| | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po
| * no this isn't it. well ok, it's part of it, but not the important part. it's ↵redmatrix2015-06-281-1/+1
| | | | | | | | still pretty cool.
| * project updatesredmatrix2015-06-262-1/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-241-11/+12
|\| | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php
| * update German help fileszottel2015-06-242-41/+56
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-233-27/+21
|\| | | | | | | | | | | Conflicts: include/items.php mod/item.php
| * Bring /help in line with the rest of the appMario Vavti2015-06-223-27/+21
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-212-0/+2
|\| | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * do not show default in scheme selection dropdown. default.php and ↵Mario Vavti2015-06-212-0/+2
| | | | | | | | default.css should be symlinks. adjust doco accordingly.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-131-1/+1
|\| | | | | | | | | Conflicts: util/messages.po
| * nginx config change from ThomasMichael Johnston2015-06-131-1/+1
| |
* | more work on itemsredmatrix2015-06-112-4/+4
|\| | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-061-2/+78
|\| | | | | | | | | Conflicts: util/messages.po
| * some doco on webpage blocksMario Vavti2015-06-041-2/+78
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-022-204/+48
|\|
| * update comanche docoMario Vavti2015-06-022-204/+48
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-272-0/+38
|\| | | | | | | | | Conflicts: mod/impel.php
| * add ability to change existing channel/account service class withHabeas Codice2015-05-262-0/+7
| | | | | | | | | | util/service_class add link from main doc
| * Add docs about current service class system, tiny util to make updates aHabeas Codice2015-05-251-0/+31
| | | | | | | | little easier than the standard config util
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-192-1/+17
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Document widget creation.Alexandre Hannud Abdo2015-05-192-1/+17
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-183-4/+51
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Create Primary-DirectoryAdam Robertson2015-05-181-0/+47
| | | | | | Description and Instruction on using a Primary Directory for a series of Private Hubs
| * spellingredmatrix2015-05-172-4/+4
| |
* | provide a warningredmatrix2015-05-171-0/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-171-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
| * update to_doredmatrix2015-05-141-0/+1
| |
* | update readmeredmatrix2015-05-171-4/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1345-208/+225
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * not sure how these files ended up here, but they belong with doxygen stuffredmatrix2015-05-132-577/+0
| |
| * remove project name dependency from most of the doc files to ease project ↵redmatrix2015-05-1347-276/+276
| | | | | | | | merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
* | correcting upstreamredmatrix2015-05-101-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-062-2/+10
|\|