aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | 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
| |/
* | search form action for channel search needs the channel addressMario Vavti2018-08-091-1/+1
| | | | | | (cherry picked from commit 054c5da294b5254cde2b0ff3dabff713c5eedb46)
* | Merge branch 'patch-9' into 'dev'Mario2018-07-301-3/+3
| | | | | | | | | | | | | | | | | | Respect navbar translations See merge request hubzilla/core!1243 (cherry picked from commit cbd8c07265590d68bedcaa105b860cfed637e49e) 05b3237b Update nav.php
* | Update network.phpgia vec2018-07-291-1/+1
| |
* | SECURITY: sanitise vcard fieldszotlabs2018-07-291-8/+8
| | | | | | (cherry picked from commit 2367d94a4264b228995e54ab6e1383652f82a2c2)
* | fix sql errorMario Vavti2018-07-261-1/+1
| | | | | | (cherry picked from commit ec3a066e4e94ad7c72d1d07371081318a4d5e9ab)
* | Merge branch '3.6RC'Mario Vavti2018-07-2525-481/+639
|\ \
| * | query filter was a bit greedyzotlabs2018-07-191-1/+1
| | | | | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109)
| * | mangled urls on redirectszotlabs2018-07-193-4/+4
| | | | | | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a)
| * | set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| |/ | | | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e)
| * fix to cart behaviourzotlabs2018-07-111-1/+1
| |
| * change to import system apps at most once a day per personzotlabs2018-07-051-2/+2
| |
| * issue syncing pageflagszotlabs2018-07-041-8/+5
| |
| * bad mergezotlabs2018-07-011-0/+4
| |
| * imagick converter: -thumbnail doesn't preserve exif, -resize doeszotlabs2018-06-261-3/+3
| |
| * crc32 is potentially reversiblezotlabs2018-06-251-1/+1
| |
| * SECURITY: logging: hash the session_id in case somebody posts log snippets ↵zotlabs2018-06-251-3/+10
| | | | | | | | from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events
| * remove the white-space pre-wrap property on code blocks. This should ↵zotlabs2018-06-241-8/+2
| | | | | | | | probably be done with the word-break property instead
| * remote_self wasn't working correctlyzotlabs2018-06-241-5/+6
| |