aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
|
* 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
|
* whitespacezotlabs2018-06-181-2/+0
|
* provide flag to collect_recipients to exclude privacy groups (for federation ↵zotlabs2018-06-181-2/+8
| | | | plugin use)
* remove several unused/unreferenced templateszotlabs2018-06-171-0/+12
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-06-172-10/+11
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-174-5/+8
| |\
| * | some work on mod groupMario2018-06-172-10/+11
| | |
* | | slightly more memory efficient way to drop posts of removed connectionszotlabs2018-06-151-7/+8
| |/ |/|