| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | Merge pull request #477 from git-marijus/dev | hubzilla | 2016-08-06 | 37 | -119/+200 | |
| | | |\ | | | | | | | | | Some work to make multiple acl forms per page work | |||||
| | | | * | Revert "Revert "remove some logging"" | Mario Vavti | 2016-08-05 | 1 | -10/+1 | |
| | | | | | | | | | | | | | | | | | This reverts commit e67f5bc6bbb77d53867d7c03bda8410c59360dbe. | |||||
| | | | * | Revert "remove some logging" | Mario Vavti | 2016-08-05 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | This reverts commit 316b090433b7e415fd3c8ac6230f2df0277cdf8c. | |||||
| | | | * | remove some logging | Mario Vavti | 2016-08-05 | 1 | -10/+1 | |
| | | | | | ||||||
| | | | * | multi acl: port /settings | Mario Vavti | 2016-08-05 | 3 | -5/+7 | |
| | | | | | ||||||
| | | | * | multi acl: port /display | Mario Vavti | 2016-08-05 | 1 | -0/+1 | |
| | | | | | ||||||
| | | | * | multi acl: port /thing | Mario Vavti | 2016-08-05 | 4 | -7/+13 | |
| | | | | | ||||||
| | | | * | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 8 | -20/+18 | |
| | | | | | ||||||
| | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 2 | -2/+42 | |
| | | | |\ | | | |/ | | |/| | ||||||
| | | * | | Merge pull request #476 from anaqreon/wiki | hubzilla | 2016-08-05 | 2 | -2/+42 | |
| | | |\ \ | | | | | | | | | | | Wiki bbcode parsing | |||||
| | | | * \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-08-04 | 1 | -11/+13 | |
| | | | |\ \ | | | |/ / | | |/| | | ||||||
| | | | * | | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 2 | -2/+8 | |
| | | | | | | ||||||
| | | | * | | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 2 | -0/+34 | |
| | | | | | | ||||||
| | | | | * | multi acl: provide a acl-form-trigger class which comes handy in certain ↵ | Mario Vavti | 2016-08-04 | 3 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | | situations | |||||
| | | | | * | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 2 | -11/+20 | |
| | | | | | | ||||||
| | | | | * | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 4 | -3/+13 | |
| | | | | | | ||||||
| | | | | * | multi acl: port /chat | Mario Vavti | 2016-08-04 | 2 | -1/+5 | |
| | | | | | | ||||||
| | | | | * | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 6 | -27/+14 | |
| | | | | | | ||||||
| | | | | * | multi acl: port photos | Mario Vavti | 2016-08-04 | 3 | -8/+13 | |
| | | | | | | ||||||
| | | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 2 | -12/+14 | |
| | | | | |\ | | | |_|/ | | |/| | | ||||||
| | | | | * | multi acl: port events | Mario Vavti | 2016-08-03 | 5 | -10/+20 | |
| | | | | | | ||||||
| | | | | * | multiple acl: store new data in update_view() | Mario Vavti | 2016-08-03 | 1 | -19/+23 | |
| | | | | | | ||||||
| | | | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 37 | -3237/+4429 | |
| | | | | |\ | ||||||
| | | | | * | | multiple acl work | Mario Vavti | 2016-08-03 | 11 | -43/+96 | |
| | | | | | | | ||||||
| | * | | | | | minor cleanup on ratings - no real functional changes at this time | redmatrix | 2016-08-04 | 2 | -12/+20 | |
| | |/ / / / | ||||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-05 | 8 | -18/+158 | |
| |\| | | | | ||||||
| | * | | | | issue #474 | redmatrix | 2016-08-03 | 1 | -11/+13 | |
| | |/ / / | ||||||
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-03 | 4 | -4/+142 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | belongs to previous commit | jeroenpraat | 2016-08-03 | 1 | -0/+1 | |
| | | | | | ||||||
| | | * | | Improved a few schemas - context help fix - dark schemas now have dark text ↵ | jeroenpraat | 2016-08-03 | 4 | -4/+141 | |
| | | | | | | | | | | | | | | | | | areas (et al.) | |||||
| | * | | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 | |
| | |/ / | ||||||
| | * | | missing comma in atoken update sql | redmatrix | 2016-08-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | comment policy permissions typo | redmatrix | 2016-08-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-02 | 10 | -27/+142 | |
| |\| | | ||||||
| | * | | this should sort out likes showing up as wall-to-wall posts on diaspora | redmatrix | 2016-08-01 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | This checkin should make all permission modes work correctly with atokens ↵ | redmatrix | 2016-08-01 | 6 | -23/+136 | |
| | | | | | | | | | | | | | (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections. | |||||
| | * | | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 3 | -4/+4 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-01 | 25 | -3212/+4151 | |
| |\| | | ||||||
| | * | | allow individual permissions on atokens | redmatrix | 2016-07-31 | 3 | -12/+98 | |
| | | | | ||||||
| | * | | add a few more path macros to portable menu elements (channelurl, pageurl, ↵ | redmatrix | 2016-07-31 | 5 | -15/+25 | |
| | | | | | | | | | | | | | storeurl and baseurl) | |||||
| | * | | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ↵ | redmatrix | 2016-07-31 | 3 | -3184/+3151 | |
| | | | | | | | | | | | | | and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit. | |||||
| | * | | Merge pull request #469 from anaqreon/website-import | hubzilla | 2016-08-01 | 15 | -1/+877 | |
| | |\ \ | | | | | | | | | Website import tool | |||||
| | | * | | Added help content for webpages app. Corrected apparent bug with capitalized ↵ | Andrew Manning | 2016-07-31 | 4 | -0/+106 | |
| | | | | | | | | | | | | | | | | | Webpages.md | |||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 3 | -3/+3 | |
| | | |\ \ | | |/ / | |/| | | ||||||
| | | * | | Remove scanned element column for existing element information which we are ↵ | Andrew Manning | 2016-07-31 | 1 | -3/+9 | |
| | | | | | | | | | | | | | | | | | not yet populating. | |||||
| | | * | | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 5 | -45/+58 | |
| | | | | | ||||||
| | | * | | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 4 | -94/+307 | |
| | | | | | ||||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 38 | -12337/+12863 | |
| | | |\| | ||||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 52 | -796/+1516 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 | |
| | | |\ \ \ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |