aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix: Authors unable to comment on posts they authored when under ↵Mario Vavti2018-09-031-15/+2
| | | | | | | | owned by others in certain circumstances." This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions.
* Merge branch 'add-delivery-status-info' into 'dev'Mario2018-09-021-2/+15
|\ | | | | | | | | Fix: Authors unable to comment on posts they authored when under owned by others… See merge request hubzilla/core!1268
| * Fix: Authors unable to comment on posts they authored when under owned by ↵M.Dent2018-09-011-2/+15
| | | | | | | | others in certain circumstances.
* | Merge branch 'call-hooks-optimization' into 'dev'Mario2018-08-301-1/+1
|\ \ | | | | | | | | | | | | Micro-optimization to call_hooks() See merge request hubzilla/core!1267
| * | Micro-optimization to call_hooks()M.Dent2018-08-291-1/+1
| | |
* | | Merge branch 'add-delivery-status-info' into 'dev'Mario2018-08-301-0/+1
|\ \ \ | | |/ | |/| | | | | | | Add dreport_process hook See merge request hubzilla/core!1266
| * | Add dreport_process hookM.Dent2018-08-291-0/+1
| |/
* / html-to-markdown adds a backslash infront of a hash after each new line - ↵Mario Vavti2018-08-291-1/+4
|/ | | | manualy remove those
* code cleanupzotlabs2018-08-232-37/+52
|
* first_post_date() (used by archive widget) - trigger the query options off ↵zotlabs2018-08-231-14/+15
| | | | of the active module rather than rely on passed parameters
* tweak archive widget for articleszotlabs2018-08-221-2/+14
|
* add api_not_found hookzotlabs2018-08-211-1/+4
|
* Zot/Finger: ignore deleted hublocszotlabs2018-08-211-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-202-51/+103
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-161-13/+27
| |\
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-154-4/+47
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-142-23/+16
| |\ \ \
| * | | | Override helpfilesM. Dent2018-08-141-38/+61
| | | | |
| * | | | Merge branch 'add-template-overrides' into 'dev'Mario2018-08-131-13/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add template overrides See merge request hubzilla/core!1256
| | * | | | Add support for overriding the default template location and individual ↵M.Dent2018-08-121-13/+42
| | | | | | | | | | | | | | | | | | | | | | | | templates via .htconfig.php
* | | | | | hubzilla core issue #1262zotlabs2018-08-171-0/+1
| |_|_|_|/ |/| | | |
* | | | | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebarzotlabs2018-08-151-13/+27
| |_|_|/ |/| | |
* | | | more backporting for zot6zotlabs2018-08-142-0/+41
| | | |
* | | | issue with mdpost addon and archive.org links which contain a full url as a ↵zotlabs2018-08-133-4/+6
| |_|/ |/| | | | | | | | path/query component
* | | hubloc DB changes needed for z6zotlabs2018-08-131-0/+2
| | |
* | | minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵zotlabs2018-08-131-23/+14
|/ / | | | | | | 'portable_id', fixed/simplified cgi auth mode
* | add table support to markdownzotlabs2018-08-121-2/+79
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-122-3/+41
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-121-0/+16
| |\
| * | revert debug comment from the last commitMario Vavti2018-08-091-1/+1
| | |
| * | fix zid leaking to nonzot sites if markdown is enabledMario Vavti2018-08-091-3/+41
| | |
| * | search form action for channel search needs the channel addressMario Vavti2018-08-091-1/+1
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-311-1/+1
| |\ \
* | | | make channel_remove less memory hungryzotlabs2018-08-121-1/+1
| |_|/ |/| |
* | | prevent json-ld bombing, turn off browser autocomplete on channel sources ↵zotlabs2018-08-111-0/+16
| | | | | | | | | | | | creation
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-301-1/+1
|\ \ \ | |/ / |/| / | |/
| * Update network.phpgia vec2018-07-301-1/+1
| | | | | | (cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
* | When checking permissions ignore checking site "Block Public" settings in ↵zotlabs2018-07-302-9/+14
| | | | | | | | cases where site permissions aren't applicable
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-291-3/+3
|\|
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-291-3/+3
| |\
| | * Update nav.phpMax Kostikov2018-07-271-3/+3
| | |
* | | this may conflictzotlabs2018-07-291-14/+15
|/ /
* / SECURITY: sanitise vcard fieldszotlabs2018-07-281-8/+8
|/
* fix sql errorMario Vavti2018-07-261-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-181-1/+3
|\
| * set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| |
* | query filter was a bit greedyzotlabs2018-07-181-1/+1
| |
* | mangled urls on redirectszotlabs2018-07-183-4/+4
|/
* fix to cart behaviourzotlabs2018-07-111-1/+1
|
* change to import system apps at most once a day per personzotlabs2018-07-051-2/+2
|