Commit Graph
618 Commits
Author SHA1 Message Date
redmatrix 3f0009ccd7 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	util/messages.po
2015-06-13 15:02:51 -07:00
Michael Johnston 053d4547fe nginx config change from Thomas 2015-06-13 00:24:11 -04:00
redmatrix 5733491ac8 more work on items
and

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
2015-06-11 17:56:56 -07:00
redmatrix ec1dcb8f2e Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	util/messages.po
2015-06-06 17:31:22 -07:00
Mario Vavti 33a122aaa8 some doco on webpage blocks 2015-06-04 22:27:55 +02:00
redmatrix 7cbc504874 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-02 17:47:47 -07:00
Mario Vavti 12408ba181 update comanche doco 2015-06-02 10:59:57 +02:00
redmatrix b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/impel.php
2015-05-27 19:27:38 -07:00
Habeas Codice bd25f8577f add ability to change existing channel/account service class with
util/service_class
add link from main doc
2015-05-26 00:21:08 -07:00
Habeas Codice f7731d7e8f Add docs about current service class system, tiny util to make updates a
little easier than the standard config util
2015-05-25 22:40:04 -07:00
redmatrix c78869e437 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-05-19 17:36:11 -07:00
Alexandre Hannud Abdo a2696bea19 Document widget creation. 2015-05-19 16:59:28 +00:00
redmatrix 2dd0e7f6bd Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-05-18 15:58:13 -07:00
Adam Robertson d50ff49f2a Create Primary-Directory
Description and Instruction on using a Primary Directory for a series of Private Hubs
2015-05-18 08:26:45 -07:00
redmatrix e271035879 provide a warning 2015-05-17 23:06:00 -07:00
redmatrix 048c745607 spelling 2015-05-17 22:08:53 -07:00
redmatrix 76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix
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
2015-05-17 19:48:57 -07:00
redmatrix dd72f580dd update readme 2015-05-17 16:40:42 -07:00
redmatrix 51b6d70996 update to_do 2015-05-14 22:42:48 -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 f866a42a42 not sure how these files ended up here, but they belong with doxygen stuff 2015-05-13 18:10:15 -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 2c7a4c254d correcting upstream 2015-05-10 13:30:30 -07:00
redmatrix 75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
Mario Vavti a1ed2bf2ac comanche doco 2015-05-06 14:17:52 +02:00
redmatrix ecbe01e3f7 i think this is 100 2015-05-05 13:42:05 -07:00
redmatrix ae1d0e5e75 update 99 2015-05-05 04:40:41 -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
redmatrix 57fcfc9398 iteration #97 2015-05-05 01:25:27 -07:00
redmatrix b22ae35c1a this will settle down eventually. 2015-05-05 01:10:45 -07:00
redmatrix fd79c59865 are we there yet? 2015-05-04 21:49:48 -07:00
redmatrix 25c861c819 readme, ad nauseum 2015-05-04 21:38:53 -07:00
redmatrix c57a1441f2 readme, yet again 2015-05-04 21:23:47 -07:00
redmatrix e6a2095aa6 readme 2015-05-04 21:20:19 -07:00
redmatrix 7a63a88bdf readme 2015-05-04 21:14:08 -07:00
redmatrix 78bf3e4c25 readme 2015-05-04 18:51:31 -07:00
Mario Vavti e8d2dd7204 document [var=wrap]none[/var] for block elements 2015-04-30 18:18:46 +02:00
friendica 5ac177391b disconnect 2015-04-23 21:13:59 -07:00
friendica 4759fa662b explain a bit more about the structure and scope 2015-04-22 16:56:42 -07:00
friendica e807231e91 add translation plugin to the to-do 2015-04-21 22:22:28 -07:00
friendica 8c54ad4f3a update to-do list 2015-04-20 01:55:23 -07:00
friendica 4383564777 doco updates 2015-04-19 21:39:45 -07:00
friendica 811cfc56d5 you need communications in there someplace. 2015-04-16 16:35:09 -07:00
friendica f09df06130 simplify 2015-04-16 15:41:27 -07:00
friendica 4d31d22d5c nits 2015-04-15 17:10:31 -07:00
friendica d7cc07f5d7 more feature editing and an "redmatrix in a nutshell" overview for those that can't figure it out. 2015-04-15 16:42:55 -07:00
friendica 338b80560f comanche preview is probably important 2015-04-14 01:13:12 -07:00
friendica 184f8d42ea jRange: width is innacurate depending on box model, padding and margins. Using css width instead. 2015-04-08 21:10:47 -07:00
friendica 37afc81847 update features, allow sys account page deletion 2015-04-08 17:54:52 -07:00