aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* revert issetMario2021-03-041-1/+1
|
* merge conflictMario2021-03-042-7/+9
|\
| * 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
| | |
* | | 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
|/ /
* | 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
| |
| * FormattingMax Kostikov2021-02-201-5/+5
| |
| * Bump DB versionMax Kostikov2021-02-201-1/+1
| |
| * Rename photo storage type system variableMax Kostikov2021-02-201-0/+17
| |
| * Merge branch 'dev' into 'dev'Max Kostikov2021-02-20738-33914/+11457
| |\ | | | | | | | | | | | | Dev sync See merge request kostikov/core!1
* | | bump dev version to 5.5Mario2021-02-231-1/+1
| | |
* | | composer dump-autoloadMario2021-02-234-1/+35
| | |
* | | update stringsMario2021-02-231-8820/+8707
| | |
* | | version 5.4RCMario2021-02-231-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Mario2021-02-232-1/+18
|\ \ \ | | | | | | | | | | | | | | | | Rename photo storage type system variable See merge request hubzilla/core!1911
| * | | Rename photo storage type system variableMax Kostikov2021-02-232-1/+18
| | |/ | |/|
* | | Merge branch 'dev' of https://codeberg.org/hubzilla/hubzilla into devMario2021-02-230-0/+0
|\ \ \
| * \ \ Merge pull request 'Update Spanish version' (#4) from mjfriaza/hubzilla:dev ↵hubzilla2021-02-232-14990/+15219
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into dev Reviewed-on: https://codeberg.org/hubzilla/hubzilla/pulls/4
| | * \ \ Merge branch 'dev' into devmjfriaza2021-02-18482-14724/+55779
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Update Spanish versionmjfriaza2021-02-182-14990/+15219
| | | | |
* | | | | Update Spanish versionmjfriaza2021-02-232-14990/+15219
| | | | |
* | | | | streamline iconf names and make sure to save the correct dataMario2021-02-223-5/+13
| |_|/ / |/| | |
* | | | provide raw base64 encoded cryptoMario2021-02-191-0/+20
| | | |
* | | | summary edit actionsMario2021-02-193-6/+9
| | | |