| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | more work separating Diaspora from core | redmatrix | 2015-08-03 | 2 | -27/+1 | |
| | | | ||||||
| * | | begin moving diaspora to plugin | redmatrix | 2015-08-02 | 2 | -127/+0 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-31 | 1 | -1/+1 | |
| |\| | | | | | | | | | Conflicts: util/messages.po | |||||
| | * | consistency of event form | redmatrix | 2015-07-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -3/+3 | |
| |\| | | | | | | | | | | | several dav fixes Conflicts: include/items.php | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -2/+16 | |
| |\| | | | | | | | | | Conflicts: util/messages.po | |||||
| | * | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 1 | -2/+16 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-26 | 1 | -2/+2 | |
| |\ \ | ||||||
| | * | | fix abook_pending reset to 1 loop if $new_friend is false and remove unused var | Mario Vavti | 2015-07-25 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-26 | 1 | -15/+4 | |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php | |||||
| | * | comment out some popover infos - we provide enough visual feedback now | Mario Vavti | 2015-07-26 | 1 | -15/+15 | |
| | | | ||||||
| | * | Provide connection status if status is "a-normal" | Mario Vavti | 2015-07-26 | 1 | -0/+4 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -2/+1 | |
| |\| | | | | | | | | | Conflicts: include/diaspora.php | |||||
| | * | event privacy issue | redmatrix | 2015-07-23 | 1 | -2/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 1 | -0/+1 | |
| |\| | | | | | | | | | Conflicts: doc/to_do_code.bb | |||||
| | * | provide content-disposition for exported ics file | redmatrix | 2015-07-20 | 1 | -0/+1 | |
| | | | ||||||
| | * | provide a way to export a single year of items (to potentially keep from ↵ | redmatrix | 2015-07-16 | 1 | -1/+9 | |
| | | | | | | | | | exhausting resources either on export or import) | |||||
| * | | the view_photos and post_photos permissions are redundant and are now mapped ↵ | redmatrix | 2015-07-19 | 4 | -9/+6 | |
| | | | | | | | | | to view_storage and write_storage | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-18 | 1 | -2/+2 | |
| |\ \ | ||||||
| | * | | make likes/dislikes work again | Mario Vavti | 2015-07-17 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | provide any single year of exported items | redmatrix | 2015-07-16 | 1 | -2/+12 | |
| |/ / | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -1/+1 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -4/+5 | |
| |\| | ||||||
| | * | provide info text for automatic permissions | Mario Vavti | 2015-07-15 | 1 | -1/+1 | |
| | | | ||||||
| | * | whitespace | Mario Vavti | 2015-07-15 | 1 | -4/+0 | |
| | | | ||||||
| | * | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 1 | -2/+7 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+1 | |
| |\| | | | | | | | | | Conflicts: mod/import.php | |||||
| | * | fix import of group members | redmatrix | 2015-07-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | group fixes to import | redmatrix | 2015-07-14 | 1 | -4/+14 | |
| | | | ||||||
| * | | more stuff to resume failed imports | redmatrix | 2015-07-14 | 1 | -1/+13 | |
| | | | ||||||
| * | | log the import progress | redmatrix | 2015-07-14 | 1 | -3/+9 | |
| | | | ||||||
| * | | provide resumable imports if things go wrong | redmatrix | 2015-07-14 | 1 | -285/+329 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 3 | -81/+46 | |
| |\| | | | | | | | | | Conflicts: mod/connedit.php | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 1 | -80/+44 | |
| | |\ | ||||||
| | | * | make strings translateable | Mario Vavti | 2015-07-14 | 1 | -0/+6 | |
| | | | | ||||||
| | | * | revert provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | remove dbg | Mario Vavti | 2015-07-14 | 1 | -2/+0 | |
| | | | | ||||||
| | | * | provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+3 | |
| | | | | ||||||
| | | * | cleanup connedit | Mario Vavti | 2015-07-14 | 1 | -80/+38 | |
| | | | | ||||||
| | * | | coverup and ignore the illegal string offset message that some sites have ↵ | redmatrix | 2015-07-14 | 1 | -1/+1 | |
| | |/ | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-13 | 1 | -1/+0 | |
| |\ \ | ||||||
| | * \ | merge | Mario Vavti | 2015-07-11 | 1 | -1/+4 | |
| | |\ \ | ||||||
| | * \ \ | merge redmatrix fixes | Mario Vavti | 2015-07-10 | 5 | -24/+26 | |
| | |\ \ \ | ||||||
| * | \ \ \ | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-13 | 2 | -7/+4 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | ||||||
| | * | | | allow sys editing of menu | redmatrix | 2015-07-11 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | whitespace and comment out info again | Mario Vavti | 2015-07-12 | 2 | -3/+3 | |
| | | | | | ||||||
| | * | | | fix sys channel menu in a morre standard way | Mario Vavti | 2015-07-12 | 2 | -4/+4 | |
| | | | | | ||||||
| | * | | | menu_id is still needed | Mario Vavti | 2015-07-12 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | make menu creation for sys channel work | Mario Vavti | 2015-07-12 | 2 | -7/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 5 | -24/+30 | |
| |\| | | | |/ / |/| | | | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po 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 |