 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
|
862bfbdd2b
|
incorrectly named doc file
|
2015-07-06 20:29:21 -07:00 |
|
|
redmatrix
|
f20933e1e0
|
more work on db storage of doco
|
2015-07-05 19:52:41 -07:00 |
|
|
redmatrix
|
aa58f68bfd
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/it/messages.po
view/it/strings.php
|
2015-07-03 14:59:04 -07:00 |
|
|
redmatrix
|
37c78bcf05
|
start doco cleanup
|
2015-07-03 14:56:48 -07:00 |
|
 zottel
|
8042ae9fe8
|
update German main help file
|
2015-07-03 11:01:26 +02:00 |
|
|
redmatrix
|
1a5898bf80
|
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
|
2015-07-02 21:58:28 -07:00 |
|
 Thomas Willingham
|
aa41842d24
|
Clean up
|
2015-06-30 17:49:09 +01: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
|
de13497333
|
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
|
2015-06-28 21:16:56 -07:00 |
|
|
redmatrix
|
002be8f9ce
|
project updates
|
2015-06-26 16:37:55 -07:00 |
|
|
redmatrix
|
5f3edabd45
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/de/features.bb
view/de/messages.po
view/de/strings.php
|
2015-06-24 16:34:52 -07:00 |
|
|
zottel
|
38302051f2
|
update German help files
|
2015-06-24 16:54:17 +02:00 |
|
|
redmatrix
|
833098e346
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
mod/item.php
|
2015-06-23 17:30:35 -07:00 |
|
 Mario Vavti
|
a4775aab9b
|
Bring /help in line with the rest of the app
|
2015-06-22 14:02:14 +02:00 |
|
|
redmatrix
|
ae6612025d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
|
2015-06-21 20:51:07 -07:00 |
|
|
Mario Vavti
|
c1e0987b88
|
do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly.
|
2015-06-21 17:53:44 +02:00 |
|
|
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 |
|