aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * use config system.server_role and deprecate 'UNO'redmatrix2016-08-0724-71/+135
| |
| * fix cloud pathredmatrix2016-08-071-1/+1
| |
| * fix /cloud upload for imagesMario Vavti2016-08-061-1/+1
| |
| * bring back acl for cloud file uploadsMario Vavti2016-08-064-19/+31
| |
| * strings updateredmatrix2016-08-051-2270/+2333
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0538-121/+242
| |\
| | * Merge pull request #477 from git-marijus/devhubzilla2016-08-0637-119/+200
| | |\ | | | | | | | | Some work to make multiple acl forms per page work
| | | * Revert "Revert "remove some logging""Mario Vavti2016-08-051-10/+1
| | | | | | | | | | | | | | | | This reverts commit e67f5bc6bbb77d53867d7c03bda8410c59360dbe.
| | | * Revert "remove some logging"Mario Vavti2016-08-051-1/+10
| | | | | | | | | | | | | | | | This reverts commit 316b090433b7e415fd3c8ac6230f2df0277cdf8c.
| | | * remove some loggingMario Vavti2016-08-051-10/+1
| | | |
| | | * multi acl: port /settingsMario Vavti2016-08-053-5/+7
| | | |
| | | * multi acl: port /displayMario Vavti2016-08-051-0/+1
| | | |
| | | * multi acl: port /thingMario Vavti2016-08-054-7/+13
| | | |
| | | * multi acl: port /rpostMario Vavti2016-08-058-20/+18
| | | |
| | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-052-2/+42
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #476 from anaqreon/wikihubzilla2016-08-052-2/+42
| | |\ \ | | | | | | | | | | Wiki bbcode parsing
| | | * \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-08-041-11/+13
| | | |\ \ | | | |/ / | | |/| |
| | | * | Parse bbcode when page loadsAndrew Manning2016-08-042-2/+8
| | | | |
| | | * | Convert select bbcode tags including [observer], [baseurl], [sitename]Andrew Manning2016-08-032-0/+34
| | | | |
| | | | * multi acl: provide a acl-form-trigger class which comes handy in certain ↵Mario Vavti2016-08-043-6/+7
| | | | | | | | | | | | | | | | | | | | situations
| | | | * multi acl: port /wikiMario Vavti2016-08-042-11/+20
| | | | |
| | | | * multi acl: port /webpages and /mitemMario Vavti2016-08-044-3/+13
| | | | |
| | | | * multi acl: port /chatMario Vavti2016-08-042-1/+5
| | | | |
| | | | * multi acl: port /cloud and /filestorageMario Vavti2016-08-046-27/+14
| | | | |
| | | | * multi acl: port photosMario Vavti2016-08-043-8/+13
| | | | |
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-042-12/+14
| | | | |\ | | | |_|/ | | |/| |
| | | | * multi acl: port eventsMario Vavti2016-08-035-10/+20
| | | | |
| | | | * multiple acl: store new data in update_view()Mario Vavti2016-08-031-19/+23
| | | | |
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-0337-3237/+4429
| | | | |\
| | | | * | multiple acl workMario Vavti2016-08-0311-43/+96
| | | | | |
| * | | | | minor cleanup on ratings - no real functional changes at this timeredmatrix2016-08-042-12/+20
| |/ / / /
* | | | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-058-18/+158
|\| | | |
| * | | | issue #474redmatrix2016-08-031-11/+13
| |/ / /
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-034-4/+142
| |\ \ \ | | | |/ | | |/|
| | * | belongs to previous commitjeroenpraat2016-08-031-0/+1
| | | |
| | * | Improved a few schemas - context help fix - dark schemas now have dark text ↵jeroenpraat2016-08-034-4/+141
| | | | | | | | | | | | | | | | areas (et al.)
| * | | issue #473 - unable to delete privacy groupsredmatrix2016-08-031-1/+1
| |/ /
| * | missing comma in atoken update sqlredmatrix2016-08-021-1/+1
| | |
| * | comment policy permissions typoredmatrix2016-08-021-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-0210-27/+142
|\| |
| * | this should sort out likes showing up as wall-to-wall posts on diasporaredmatrix2016-08-011-0/+2
| | |
| * | This checkin should make all permission modes work correctly with atokens ↵redmatrix2016-08-016-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/redmatrix2016-08-013-4/+4
| | |
* | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-0125-3212/+4151
|\| |
| * | allow individual permissions on atokensredmatrix2016-07-313-12/+98
| | |
| * | add a few more path macros to portable menu elements (channelurl, pageurl, ↵redmatrix2016-07-315-15/+25
| | | | | | | | | | | | storeurl and baseurl)
| * | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ↵redmatrix2016-07-313-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-importhubzilla2016-08-0115-1/+877
| |\ \ | | | | | | | | Website import tool
| | * | Added help content for webpages app. Corrected apparent bug with capitalized ↵Andrew Manning2016-07-314-0/+106
| | | | | | | | | | | | | | | | Webpages.md
| | * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-313-3/+3
| | |\ \ | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 12:06:19 +0000