Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2021-03-08 | 1 | -0/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Define $sql_extra2 variable before extending | Max Kostikov | 2021-03-08 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | fix summary not saved in browser autosave draft | Mario | 2021-03-08 | 1 | -0/+7 | |
| | |/ / / / | ||||||
| | * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2021-03-08 | 3 | -3/+2 | |
| | |\ \ \ \ | ||||||
| | | * | | | | 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 | |||||
| | * | | | | | | | type submit should not be type button | Mario | 2021-03-08 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | fix unexpected trigger of buttons when pressing enter in input field issue #1528 | Mario | 2021-03-08 | 2 | -28/+28 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Update Spanish | mjfriaza | 2021-03-08 | 2 | -15205/+15097 | |
| | | | | | | | | ||||||
| | * | | | | | | fix dev version | Mario | 2021-03-08 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | a bit more useability for the admin at the beginning | Hilmar R | 2021-03-03 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | embarrassing :-( | Hilmar R | 2021-03-02 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | did2 chk num 5...10 | Hilmar R | 2021-03-02 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | hope not to hurry too fast when saying 5.4RC2. But today & tomorrow is only ↵ | Hilmar R | 2021-03-02 | 2 | -2/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the tests | |||||
| * | | | | | | | melt include/account | Hilmar R | 2021-03-02 | 2 | -78/+553 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Hilmar R | 2021-03-01 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| * | | | | | | | get dev | Hilmar R | 2021-03-01 | 1194 | -68684/+122630 | |
| | | | | | | | | ||||||
| * | | | | | | | adjust air.5 to be in sync with 5.2.2 | Hilmar R | 2021-02-26 | 3 | -53/+77 | |
| | | | | | | | | ||||||
| * | | | | | | | repair dd tag and set unique vsn | Hilmar R | 2021-02-26 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | forgotten docs | Hilmar R | 2021-01-30 | 3 | -0/+81 | |
| | | | | | | | | ||||||
| * | | | | | | | validate,invite | Hilmar R | 2021-01-30 | 1 | -11/+21 | |
| | | | | | | | | ||||||
| * | | | | | | | context help register en,de | Hilmar R | 2021-01-29 | 1 | -1/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | Register panel interaction consistence usage | Hilmar R | 2021-01-28 | 4 | -54/+84 | |
| | | | | | | | | ||||||
| * | | | | | | | login panel, reg limits. | Hilmar R | 2021-01-27 | 4 | -38/+56 | |
| | | | | | | | | ||||||
| * | | | | | | | Two field positions | Hilmar R | 2021-01-24 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | auto channel create adjustments | Hilmar R | 2021-01-24 | 1 | -9/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | auto channel create adjustments, zar log reg msgs | Hilmar R | 2021-01-24 | 2 | -4/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | 2 fields dups removed | Hilmar R | 2021-01-23 | 1 | -4/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | typo | Hilmar R | 2021-01-23 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | melt diff prod fork 4.6.2 air onto 5.2.1 to 5.2.2 DB 1241 | Hilmar R | 2021-01-23 | 25 | -432/+2810 | |
| | | | | | | | | ||||||
| * | | | | | | | at end of day, some files probably without conflicts so far | Hilmar R | 2021-01-23 | 21 | -4/+243 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into air.5 | Hilmar R | 2021-01-22 | 514 | -15785/+36223 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | air.s1: field templates checkbox/input/select and one new | me | 2020-11-14 | 4 | -4/+139 | |
| | | | | | | | | | ||||||
* | | | | | | | | | version 5.4.35.4.3 | Mario Vavti | 2021-04-20 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | changelog | Mario | 2021-04-20 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5dfe4ef6f8efc34de03953a91980b52646233a29) | |||||
* | | | | | | | | | fix regression in mod notifications | Mario | 2021-04-20 | 1 | -10/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b8a5f5fbf2b1702642c9489ea5ae3360c5b731bb) | |||||
* | | | | | | | | | floc off google | Mario | 2021-04-20 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7ccd7b439f5a029384ecb28911a0df6f6d658231) | |||||
* | | | | | | | | | use protect_sprintf() on query strings | Mario | 2021-04-20 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f9793e870f5c3c531fe48a2294782de0643a6c9b) | |||||
* | | | | | | | | | Wfinger - check https from http_x_forwarded_proto | Miłosz Kłosowicz | 2021-04-20 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit aa2450fae1fe41a6b100d152209f66fb66bc270e) | |||||
* | | | | | | | | | fix regression finding bookmarks | Mario | 2021-04-20 | 1 | -7/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 16cc695115688b04dae1b3ab97aef149b17bc7e4) | |||||
* | | | | | | | | | potential export issue when using PHP8 | Mario | 2021-04-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ba412bc6cf0110b089493ee8f9b65cda0487001f) | |||||
* | | | | | | | | | if we use dbescbin on save we should use dbunescbin when retrieving (at ↵ | Mario | 2021-04-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | least that is true for postgres) (cherry picked from commit 31abcac4b4dc9e21588deb84b93bc41d761ed630) | |||||
* | | | | | | | | | when importing a channel, make sure we import the xchan before the hubloc - ↵ | Mario | 2021-04-20 | 1 | -9/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise we can not verify the hubloc hash (cherry picked from commit eaf9003ca27c52c571f940e49fcfba6e1c8fe629) | |||||
* | | | | | | | | | revert last part of previous commit -> see comment above the change | Mario | 2021-04-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit eded0f6c09475a138e042de4f6845d54e7a6e60c) |