Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-03-03 | 10 | -119/+139 |
|\ | | | | | | | # Conflicts: # boot.php | ||||
| * | 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) | ||||
* | | 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 | ||||
| * | 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 |
| | | |||||
* | | Update Russian hstrings.php | Max Kostikov | 2021-02-23 | 1 | -2708/+2714 |
| | | |||||
* | | Update Russian hmessages.po | Max Kostikov | 2021-02-23 | 1 | -11034/+10927 |
| | | |||||
* | | Missprint | Max Kostikov | 2021-02-23 | 1 | -1/+1 |
| | | |||||
* | | Fix missprint | Max Kostikov | 2021-02-21 | 1 | -1/+1 |
| | | |||||
* | | Formatting | Max Kostikov | 2021-02-20 | 1 | -5/+5 |
| | | |||||
* | | Bump DB version | Max Kostikov | 2021-02-20 | 1 | -1/+1 |
| | | |||||
* | | Rename photo storage type system variable | Max Kostikov | 2021-02-20 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2021-02-20 | 738 | -33914/+11457 |
|\ \ | | | | | | | | | | | | | Dev sync See merge request kostikov/core!1 | ||||
| | * | bump dev version to 5.5 | Mario | 2021-02-23 | 1 | -1/+1 |
| | | | |||||
| | * | composer dump-autoload | Mario | 2021-02-23 | 4 | -1/+35 |
| | | | |||||
| | * | update strings | Mario | 2021-02-23 | 1 | -8820/+8707 |
| | | | |||||
| | * | version 5.4RC | Mario | 2021-02-23 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2021-02-23 | 2 | -1/+18 |
| | |\ | | | | | | | | | | | | | | | | | Rename photo storage type system variable See merge request hubzilla/core!1911 | ||||
| | | * | Rename photo storage type system variable | Max Kostikov | 2021-02-23 | 2 | -1/+18 |
| | |/ | |/| | |||||
| | * | Merge branch 'dev' of https://codeberg.org/hubzilla/hubzilla into dev | Mario | 2021-02-23 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge pull request 'Update Spanish version' (#4) from mjfriaza/hubzilla:dev ↵ | hubzilla | 2021-02-23 | 2 | -14990/+15219 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | into dev Reviewed-on: https://codeberg.org/hubzilla/hubzilla/pulls/4 | ||||
| | | | * | Merge branch 'dev' into dev | mjfriaza | 2021-02-18 | 482 | -14724/+55779 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | | * | Update Spanish version | mjfriaza | 2021-02-18 | 2 | -14990/+15219 |
| | | | | | |||||
| | * | | | Update Spanish version | mjfriaza | 2021-02-23 | 2 | -14990/+15219 |
| | | | | | |||||
| | * | | | streamline iconf names and make sure to save the correct data | Mario | 2021-02-22 | 3 | -5/+13 |
| |/ / / | |||||
| * | | | provide raw base64 encoded crypto | Mario | 2021-02-19 | 1 | -0/+20 |
| | | | | |||||
| * | | | summary edit actions | Mario | 2021-02-19 | 3 | -6/+9 |
| | | | | |||||
| * | | | deprecate summary tag in favour of a separate input field | Mario | 2021-02-19 | 7 | -44/+33 |
| | | | | |||||
| * | | | update site once a day | Mario | 2021-02-19 | 1 | -3/+21 |
| | | | | |||||
| * | | | fix recursive shares | Mario | 2021-02-19 | 2 | -19/+20 |
| | | | | |||||
| * | | | fix summary regex after recent bbcode chane | Mario | 2021-02-18 | 2 | -2/+2 |
| | | | | |||||
| * | | | adjust error reporting for php8 to not report warnings - they are too many | Mario | 2021-02-18 | 1 | -1/+5 |
| | | | |