aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Revert "Revert "remove some logging""Mario Vavti2016-08-051-10/+1
| | * Revert "remove some logging"Mario Vavti2016-08-051-1/+10
| | * 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
| |\ \
| | * \ 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
|/ / / /
* / / / 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
* | 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
* | 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
| |\ \ | |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-3010-5092/+5417
|\ \ \ | | |/ | |/|
* | | issue #466, sql typoredmatrix2016-07-283-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
| | |\ | | |/ | |/|
| * | Updating es-es stringsjeroenpraat2016-07-292-5059/+5299
| * | catch all input fields (in preparation for acl in this place) and display the...Mario Vavti2016-07-292-4/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 08:23:06 +0000