| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #380 from git-marijus/dev | redmatrix | 2016-05-14 | 3 | -61/+72 |
| |\ | | | | | instead of radio buttons use select to choose between public and custom selection | ||||
| | * | change wording restricted -> custom selection and add a label to the select | Mario Vavti | 2016-05-13 | 2 | -2/+3 |
| | | | |||||
| | * | instead of radio buttons use select to choose between public and restricted ↵ | Mario Vavti | 2016-05-13 | 3 | -61/+71 |
| |/ | | | | acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible. | ||||
| * | strings update | redmatrix | 2016-05-13 | 1 | -1577/+1639 |
| | | |||||
| * | Comanche: provide a variable '$region' which can be used within a layout to ↵ | redmatrix | 2016-05-12 | 1 | -3/+4 |
| | | | | | make content aware of where it is on the page. For instance this can be passed as a variable to a widget and trigger either a vertical or horizontal layout depending on which region it is assigned to. | ||||
| * | split off feed handling stuff from include/items | redmatrix | 2016-05-12 | 2 | -1312/+1319 |
| | | |||||
| * | remove the rarely if ever used filter_insecure() function. We will provide ↵ | redmatrix | 2016-05-12 | 1 | -41/+0 |
| | | | | | this functionality in other ways. | ||||
| * | SECURITY: a comment to a private post that has been edited (the comment has ↵ | redmatrix | 2016-05-12 | 1 | -0/+10 |
| | | | | | been edited) loses its privacy settings. This comment isn't visible in the stream but may be visible in feeds. | ||||
| * | back merge | redmatrix | 2016-05-12 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #379 from mjfriaza/dev | redmatrix | 2016-05-13 | 13 | -92/+25 |
| |\ | | | | | Updated contextual help in Spanish | ||||
| | * | Updated contextual help in Spanish | Manuel Jiménez Friaza | 2016-05-12 | 13 | -92/+25 |
| | | | |||||
| * | | Merge pull request #378 from anaqreon/plugin-init | redmatrix | 2016-05-13 | 1 | -0/+26 |
| |\ \ | |/ |/| | Create store/git/sys/extend/addon directory and link if it does not e… | ||||
| | * | Create store/git/sys/extend/addon directory and link if it does not exist in ↵ | Andrew Manning | 2016-05-12 | 1 | -0/+26 |
| |/ | | | | all plugin repo GUI POST actions | ||||
| * | Merge branch 'dev'1.6 | redmatrix | 2016-05-11 | 1 | -0/+76 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-11 | 1 | -0/+76 |
| | |\ | |||||
| | | * | Merge pull request #377 from anaqreon/chat-notify | redmatrix | 2016-05-12 | 1 | -0/+76 |
| | | |\ | | | | | | | | | Chat browser notifications | ||||
| | | | * | Merge remote-tracking branch 'upstream/dev' into chat-notify | Andrew Manning | 2016-05-11 | 3 | -86/+111 |
| | | | |\ | |||||
| | | | * | | Browser notification issued when member enters chat room | Andrew Manning | 2016-05-11 | 1 | -0/+76 |
| | | | | | | |||||
| | * | | | | move dev pointer past current release | redmatrix | 2016-05-11 | 1 | -1/+1 |
| | |/ / / | |||||
| * / / / | push point release | redmatrix | 2016-05-11 | 2 | -1/+50 |
| |/ / / | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-11 | 3 | -86/+111 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge pull request #376 from anaqreon/plugin-repo | redmatrix | 2016-05-12 | 2 | -66/+91 |
| | |\ \ | | | | | | | | | Check if target directories are writable when adding, updating, or removing plugin repos | ||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-11 | 741 | -42404/+64756 |
| | | |\| | |||||
| | | * | | Check if target directories are writable when adding, updating, or removing ↵ | Andrew Manning | 2016-05-11 | 2 | -66/+91 |
| | | | | | | | | | | | | | | | | | plugin repos | ||||
| | * | | | more whitespace | Mario Vavti | 2016-05-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | whitespace | Mario Vavti | 2016-05-11 | 1 | -19/+19 |
| | | |/ | |/| | |||||
| * / | | Ensure that channels can't be created with DAV reserved paths as a redress. ↵ | redmatrix | 2016-05-11 | 2 | -4/+22 |
| |/ / | | | | | | | Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered. | ||||
| * | | provide repository versions on admin summary page and an upgrade message if ↵ | redmatrix | 2016-05-10 | 4 | -7/+42 |
| | | | | | | | | | you're behind master | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -0/+15 |
| |\ \ | |||||
| | * | | Merge pull request #375 from anaqreon/plugin-repo | redmatrix | 2016-05-11 | 1 | -0/+15 |
| | |\| | | | | | | | Plugin repo | ||||
| | | * | Remove debugging lines | Andrew Manning | 2016-05-10 | 1 | -4/+0 |
| | | | | |||||
| | | * | Link plugins in the newly installed addon repo to /addon so they are accessible | Andrew Manning | 2016-05-10 | 1 | -0/+19 |
| | | | | |||||
| * | | | sabre upgrade | redmatrix | 2016-05-10 | 4 | -71/+57 |
| | | | | |||||
| * | | | initial sabre upgrade (needs lots of work - to wit: authentication, redo the ↵ | redmatrix | 2016-05-10 | 735 | -42343/+64674 |
| |/ / | | | | | | | browser interface, and rework event export/import) | ||||
| * | | Merge pull request #374 from anaqreon/plugin-repo | redmatrix | 2016-05-10 | 2 | -4/+17 |
| |\| | | | | | Delete existing repo if the new one has a different URL. Fixed bug th… | ||||
| | * | Delete existing repo if the new one has a different URL. Fixed bug that ↵ | Andrew Manning | 2016-05-10 | 2 | -4/+17 |
| |/ | | | | could cause repeated installation. | ||||
| * | another public -> pubstream | Mario Vavti | 2016-05-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -2/+2 |
| |\ | |||||
| | * | allow delayed publishing of webpages | Mario Vavti | 2016-05-10 | 1 | -2/+2 |
| | | | |||||
| * | | try again with shutdown handler, fix issue #373 (live-pubstream div wasn't ↵ | redmatrix | 2016-05-10 | 4 | -5/+17 |
| |/ | | | | present | ||||
| * | revert shutdown function | redmatrix | 2016-05-09 | 2 | -2/+4 |
| | | |||||
| * | more work on diaspora relay | redmatrix | 2016-05-09 | 1 | -0/+5 |
| | | |||||
| * | register shutdown procedure | redmatrix | 2016-05-09 | 2 | -1/+8 |
| | | |||||
| * | Merge pull request #372 from anaqreon/plugin-repo | redmatrix | 2016-05-10 | 128 | -18/+18604 |
| |\ | | | | | Manage addon git repositories via the admin plugins page | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-09 | 30 | -357/+425 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #371 from Treer/permissions | redmatrix | 2016-05-10 | 3 | -11/+20 |
| |\ \ | | | | | | | minor cleanup. No functional changes | ||||
| | * | | minor cleanup. No functional changes | Treer | 2016-05-10 | 3 | -11/+20 |
| |/ / | |||||
| * | | if we do not have a layout $layout should be empty not default | Mario Vavti | 2016-05-09 | 1 | -1/+1 |
| | | | |||||
| * | | remove unused code and whitespace | Mario Vavti | 2016-05-09 | 2 | -11/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 4 | -13/+26 |
| |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |