| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -0/+7 |
| |\ | | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php | ||||
| | * | Update the credits | redmatrix | 2015-09-02 | 1 | -1/+7 |
| | | | |||||
| * | | mostly doc tweaks, some import/export work | redmatrix | 2015-08-31 | 2 | -23/+1 |
| | | | |||||
| * | | update history | redmatrix | 2015-08-31 | 1 | -6/+12 |
| | | | |||||
| * | | documentation re-org | redmatrix | 2015-08-31 | 7 | -305/+90 |
| | | | |||||
| * | | rename 'register_account' hook to 'create_identity'. | redmatrix | 2015-08-31 | 1 | -12/+14 |
| | | | |||||
| * | | unclosed link tags | redmatrix | 2015-08-30 | 1 | -2/+5 |
| | | | |||||
| * | | more work on doco search | redmatrix | 2015-08-30 | 1 | -0/+3 |
| | | | |||||
| * | | make diaspora person guids for hubzilla folks globally unique. That's what a ↵ | redmatrix | 2015-08-25 | 1 | -0/+4 |
| | | | | | | | | | globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision. | ||||
| * | | add load_pdl hook for plugins | redmatrix | 2015-08-22 | 1 | -1/+1 |
| | | | |||||
| * | | add task widget | redmatrix | 2015-08-21 | 1 | -0/+5 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-19 | 1 | -0/+1 |
| |\| | | | | | | | | | Conflicts: include/api.php | ||||
| | * | update to_do | redmatrix | 2015-08-18 | 1 | -0/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -9/+9 |
| |\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | ||||
| | * | doc fixes | redmatrix | 2015-08-11 | 1 | -8/+8 |
| | | | |||||
| * | | remove the forum limit | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | | |||||
| * | | bring back colour to abook_self in acl | redmatrix | 2015-08-11 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix0.8 | redmatrix | 2015-08-06 | 1 | -2/+2 |
| |\| | |||||
| | * | closing tags | redmatrix | 2015-08-06 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 2 | -17/+21 |
| |\| | | | | | | | | | Conflicts: doc/to_do_code.bb | ||||
| | * | indicate where progress has been made | redmatrix | 2015-07-20 | 2 | -16/+20 |
| | | | |||||
| * | | incorrectly named doc file | redmatrix | 2015-07-06 | 1 | -0/+0 |
| | | | |||||
| * | | more work on db storage of doco | redmatrix | 2015-07-05 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -1/+0 |
| |\| | | | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php | ||||
| | * | update German main help file | zottel | 2015-07-03 | 1 | -1/+0 |
| | | | |||||
| * | | start doco cleanup | redmatrix | 2015-07-03 | 63 | -62/+62 |
| | | | |||||
| * | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 4 | -35/+1 |
| |\| | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php | ||||
| | * | Clean up | Thomas Willingham | 2015-06-30 | 4 | -35/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 2 | -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 ↵ | redmatrix | 2015-06-28 | 1 | -1/+1 |
| | | | | | | | | | still pretty cool. | ||||
| | * | project updates | redmatrix | 2015-06-26 | 2 | -1/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 1 | -11/+12 |
| |\| | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | ||||
| | * | update German help files | zottel | 2015-06-24 | 2 | -41/+56 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 3 | -27/+21 |
| |\| | | | | | | | | | | | Conflicts: include/items.php mod/item.php | ||||
| | * | Bring /help in line with the rest of the app | Mario Vavti | 2015-06-22 | 3 | -27/+21 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 2 | -0/+2 |
| |\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | ||||
| | * | do not show default in scheme selection dropdown. default.php and ↵ | Mario Vavti | 2015-06-21 | 2 | -0/+2 |
| | | | | | | | | | default.css should be symlinks. adjust doco accordingly. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-13 | 1 | -1/+1 |
| |\| | | | | | | | | | Conflicts: util/messages.po | ||||
| | * | nginx config change from Thomas | Michael Johnston | 2015-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | more work on items | redmatrix | 2015-06-11 | 2 | -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/redmatrix | redmatrix | 2015-06-06 | 1 | -2/+78 |
| |\| | | | | | | | | | Conflicts: util/messages.po | ||||
| | * | some doco on webpage blocks | Mario Vavti | 2015-06-04 | 1 | -2/+78 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 2 | -204/+48 |
| |\| | |||||
| | * | update comanche doco | Mario Vavti | 2015-06-02 | 2 | -204/+48 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 2 | -0/+38 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | add ability to change existing channel/account service class with | Habeas Codice | 2015-05-26 | 2 | -0/+7 |
| | | | | | | | | | | | util/service_class add link from main doc | ||||
| | * | Add docs about current service class system, tiny util to make updates a | Habeas Codice | 2015-05-25 | 1 | -0/+31 |
| | | | | | | | | | little easier than the standard config util | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 2 | -1/+17 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | Document widget creation. | Alexandre Hannud Abdo | 2015-05-19 | 2 | -1/+17 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 3 | -4/+51 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |