aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * 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
| | |\ \
| | | * \ 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 situ...Mario Vavti2016-08-043-6/+7
| | | | * 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 a...jeroenpraat2016-08-034-4/+141
| * | | 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 (th...redmatrix2016-08-016-23/+136
| * | /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, st...redmatrix2016-07-315-15/+25
| * | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ...redmatrix2016-07-313-3184/+3151
| * | Merge pull request #469 from anaqreon/website-importhubzilla2016-08-0115-1/+877
| |\ \
| | * | Added help content for webpages app. Corrected apparent bug with capitalized ...Andrew Manning2016-07-314-0/+106
| | * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-313-3/+3
| | |\ \ | | |/ / | |/| |
| | * | Remove scanned element column for existing element information which we are n...Andrew Manning2016-07-311-3/+9
| | * | Improved UI. Removed logger statements.Andrew Manning2016-07-315-45/+58
| | * | Import element selection page added to allow selective importing.Andrew Manning2016-07-304-94/+307
| | * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3038-12337/+12863
| | |\|
| | * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2152-796/+1516
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-209-15/+52
| | |\ \ \ \
| | * | | | | Starting to make the import selection page after element scan.Andrew Manning2016-07-203-80/+176
| | * | | | | Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-173-7/+26
| | * | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-175-21/+48
| | |\ \ \ \ \
| | * | | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-174-56/+91
| | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1634-2397/+2326
| | |\ \ \ \ \ \
| | * | | | | | | Stash changes to merge from devAndrew Manning2016-07-163-30/+52
| | * | | | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-163-6/+55
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 03:58:54 +0000