aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2021-03-081-1/+0
|\ | | | | | | # Conflicts: # boot.php
| * Merge branch 'dev' into 'dev'Max Kostikov2021-03-0310-119/+139
| |\ | | | | | | | | | # Conflicts: # boot.php
| * | Fix frame-src CSP error on video embeddingMax Kostikov2021-03-031-4/+5
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2021-02-2734-23970/+24255
| |\ \ | | | | | | | | | | | | | | | | Dev sync See merge request kostikov/core!2
* | | | Update Spanishmjfriaza2021-03-082-15205/+15097
| | | |
* | | | fix dev versionMario2021-03-082-2/+2
| | | |
* | | | changelogMario2021-03-082-2/+4
|\ \ \ \
| * | | | version 5.4RC2Mario2021-03-041-1/+1
| | | | |
| * | | | changelogMario2021-03-041-1/+66
| | | | |
| * | | | revert issetMario2021-03-041-1/+1
| | | | |
| * | | | merge conflictMario2021-03-042-7/+9
| |\ \ \ \
| * | | | | set the default collection acl if indicated so by the role permissions but ↵Mario2021-03-031-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | always set the created friends group as channel_default_group when creating a new channel
| * | | | | group_add(): return hash if successMario2021-03-031-23/+29
| | | | | |
| * | | | | php8: fix warnings during install procedureMario2021-03-039-83/+98
| | | | | |
| * | | | | version 5.4RC1Mario2021-02-261-1/+1
| | | | | |
* | | | | | update sbomMario2021-03-061-8/+8
| | | | | |
* | | | | | fix varable name and more changelogMario2021-03-062-1/+3
| | | | | |
* | | | | | sse_bs: if Enotify::format() returns an empty array do not add it to ↵Mario2021-03-052-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | notifications (the item has probably been blocked)
* | | | | | even more changelogMario2021-03-041-2/+3
| | | | | |
* | | | | | more changelogMario2021-03-041-0/+1
| | | | | |
* | | | | | revert revert isset()Mario2021-03-041-1/+1
| | | | | |
* | | | | | revert isset()Mario2021-03-041-1/+1
| | | | | |
* | | | | | changelogMario2021-03-041-1/+66
| | | | | | | | | | | | | | | | | | (cherry picked from commit 548936c6ca6e016e6fb8bbe649d8caf1e26bb731)
* | | | | | Check if custom CSP is setMax Kostikov2021-03-041-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'dev' into 'dev'Mario2021-03-041-5/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix frame-src CSP error on video embedding See merge request hubzilla/core!1918
| * | | | Fix frame-src CSP error on video embeddingMax Kostikov2021-03-041-5/+6
|/ / / /
* | | | set the default collection acl if indicated so by the role permissions but ↵Mario2021-03-031-14/+13
| | | | | | | | | | | | | | | | | | | | always set the created friends group as channel_default_group when creating a new channel (cherry picked from commit 9389abdb757d5cb5b4b4322260e86c47d11ff043)
* | | | group_add(): return hash if successMario2021-03-031-23/+29
| | | | | | | | | | | | (cherry picked from commit f8f15f526f68073baa1e4e846ab87a66c2d5b291)
* | | | php8: fix warnings during install procedureMario2021-03-039-83/+98
| |_|/ |/| | | | | (cherry picked from commit 48bae9d4219735bc44f4ee72228d19d3e6b9efc9)
* | | Merge branch 'dev' into 'dev'Mario2021-02-261-3/+3
|\ \ \ | |/ / |/| / | |/ | | Do not overwrite HTTP schema for Youtube on embedding See merge request hubzilla/core!1917
| * Do not overwrite HTTP schema for Youtube on embeddingMax Kostikov2021-02-251-3/+3
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-02-253-21/+20
|\ \
| * \ Merge branch 'dev' into 'dev'Mario2021-02-251-5/+4
| |\ \ | | | | | | | | | | | | | | | | small adjustment See merge request hubzilla/core!1915
| | * | small adjustmentZot2021-02-251-5/+4
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2021-02-252-16/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Enable multimedia in podcasts See merge request hubzilla/core!1916
| | * | | - Enable enclosures in Atom/RSS (podcasts)Michal Klodner2021-02-242-16/+16
| | |/ / | | | | | | | | - Remove checking of audio/video URLs for pattern at the end
* | / / a possible fix for #1518Mario2021-02-251-1/+1
|/ / /
* | | do not poll feeds if feed_contacts are not allowedMario2021-02-251-1/+7
| | |
* | | fix logicMario2021-02-251-5/+4
| | |
* | | bump versionMario2021-02-251-1/+1
| | |
* | | replace sticky_kit with a simpler homwgrown solution (still a bit raw) and ↵Mario2021-02-2512-59/+79
|/ / | | | | | | slightly change the way we load new content so that people with a long aside column do not have to scroll all the way to the bottom for loading the next page
* | zap compat export fixesMario2021-02-241-8/+4
| |
* | Merge branch 'dev' into 'dev'Mario2021-02-247-66/+173
|\ \ | | | | | | | | | | | | export compatibility from hubzilla to zap See merge request hubzilla/core!1910
| * | export compatibility from hubzilla to zapZot2021-02-247-66/+173
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2021-02-233-13743/+13642
|\| | | | | | | | | Update Russian translation See merge request hubzilla/core!1912
| * Update hmessages.poMax Kostikov2021-02-231-1/+1
| |
| * Update Russian hstrings.phpMax Kostikov2021-02-231-2708/+2714
| |
| * Update Russian hmessages.poMax Kostikov2021-02-231-11034/+10927
| |
| * MissprintMax Kostikov2021-02-231-1/+1
| |
| * Fix missprintMax Kostikov2021-02-211-1/+1
| |