Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2021-03-08 | 1 | -1/+1 |
|\ | | | | | | | | | Fix undefined page end on non dynamic pages See merge request hubzilla/core!1920 | ||||
| * | Fix Spanish plural expression | Max Kostikov | 2021-03-08 | 1 | -1/+1 |
| | | |||||
| * | Fix undefined page end on non dynamic pages | Max Kostikov | 2021-03-08 | 1 | -1/+1 |
| | | |||||
* | | Fix Spanish plural expression | Max Kostikov | 2021-03-08 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-03-08 | 1 | -1/+0 |
|\ | | | | | | | # Conflicts: # boot.php | ||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-03-03 | 10 | -119/+139 |
| |\ | | | | | | | | | | # Conflicts: # boot.php | ||||
| * | | Fix frame-src CSP error on video embedding | Max Kostikov | 2021-03-03 | 1 | -4/+5 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-02-27 | 34 | -23970/+24255 |
| |\ \ | | | | | | | | | | | | | | | | | Dev sync See merge request kostikov/core!2 | ||||
* | | | | Update Spanish | mjfriaza | 2021-03-08 | 2 | -15205/+15097 |
| | | | | |||||
* | | | | fix dev version | Mario | 2021-03-08 | 2 | -2/+2 |
| | | | | |||||
* | | | | changelog | Mario | 2021-03-08 | 2 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | version 5.4RC2 | Mario | 2021-03-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | changelog | Mario | 2021-03-04 | 1 | -1/+66 |
| | | | | | |||||
| * | | | | revert isset | Mario | 2021-03-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | merge conflict | Mario | 2021-03-04 | 2 | -7/+9 |
| |\ \ \ \ | |||||
| * | | | | | set the default collection acl if indicated so by the role permissions but ↵ | Mario | 2021-03-03 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | always set the created friends group as channel_default_group when creating a new channel | ||||
| * | | | | | group_add(): return hash if success | Mario | 2021-03-03 | 1 | -23/+29 |
| | | | | | | |||||
| * | | | | | php8: fix warnings during install procedure | Mario | 2021-03-03 | 9 | -83/+98 |
| | | | | | | |||||
| * | | | | | version 5.4RC1 | Mario | 2021-02-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | update sbom | Mario | 2021-03-06 | 1 | -8/+8 |
| | | | | | | |||||
* | | | | | | fix varable name and more changelog | Mario | 2021-03-06 | 2 | -1/+3 |
| | | | | | | |||||
* | | | | | | sse_bs: if Enotify::format() returns an empty array do not add it to ↵ | Mario | 2021-03-05 | 2 | -6/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | notifications (the item has probably been blocked) | ||||
* | | | | | | even more changelog | Mario | 2021-03-04 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | more changelog | Mario | 2021-03-04 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | revert revert isset() | Mario | 2021-03-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | revert isset() | Mario | 2021-03-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | changelog | Mario | 2021-03-04 | 1 | -1/+66 |
| | | | | | | | | | | | | | | | | | | (cherry picked from commit 548936c6ca6e016e6fb8bbe649d8caf1e26bb731) | ||||
* | | | | | | Check if custom CSP is set | Max Kostikov | 2021-03-04 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'dev' into 'dev' | Mario | 2021-03-04 | 1 | -5/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Fix frame-src CSP error on video embedding See merge request hubzilla/core!1918 | ||||
| * | | | | Fix frame-src CSP error on video embedding | Max Kostikov | 2021-03-04 | 1 | -5/+6 |
|/ / / / | |||||
* | | | | set the default collection acl if indicated so by the role permissions but ↵ | Mario | 2021-03-03 | 1 | -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 success | Mario | 2021-03-03 | 1 | -23/+29 |
| | | | | | | | | | | | | (cherry picked from commit f8f15f526f68073baa1e4e846ab87a66c2d5b291) | ||||
* | | | | php8: fix warnings during install procedure | Mario | 2021-03-03 | 9 | -83/+98 |
| |_|/ |/| | | | | | (cherry picked from commit 48bae9d4219735bc44f4ee72228d19d3e6b9efc9) | ||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2021-02-26 | 1 | -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 embedding | Max Kostikov | 2021-02-25 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2021-02-25 | 3 | -21/+20 |
|\ \ | |||||
| * \ | Merge branch 'dev' into 'dev' | Mario | 2021-02-25 | 1 | -5/+4 |
| |\ \ | | | | | | | | | | | | | | | | | small adjustment See merge request hubzilla/core!1915 | ||||
| | * | | small adjustment | Zot | 2021-02-25 | 1 | -5/+4 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2021-02-25 | 2 | -16/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Enable multimedia in podcasts See merge request hubzilla/core!1916 | ||||
| | * | | | - Enable enclosures in Atom/RSS (podcasts) | Michal Klodner | 2021-02-24 | 2 | -16/+16 |
| | |/ / | | | | | | | | | - Remove checking of audio/video URLs for pattern at the end | ||||
* | / / | a possible fix for #1518 | Mario | 2021-02-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | do not poll feeds if feed_contacts are not allowed | Mario | 2021-02-25 | 1 | -1/+7 |
| | | | |||||
* | | | fix logic | Mario | 2021-02-25 | 1 | -5/+4 |
| | | | |||||
* | | | bump version | Mario | 2021-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | replace sticky_kit with a simpler homwgrown solution (still a bit raw) and ↵ | Mario | 2021-02-25 | 12 | -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 fixes | Mario | 2021-02-24 | 1 | -8/+4 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2021-02-24 | 7 | -66/+173 |
|\ \ | | | | | | | | | | | | | export compatibility from hubzilla to zap See merge request hubzilla/core!1910 | ||||
| * | | export compatibility from hubzilla to zap | Zot | 2021-02-24 | 7 | -66/+173 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-02-23 | 3 | -13743/+13642 |
|\| | | | | | | | | | Update Russian translation See merge request hubzilla/core!1912 | ||||
| * | Update hmessages.po | Max Kostikov | 2021-02-23 | 1 | -1/+1 |
| | |