aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-03-081-0/+1
| | |\ \ \ \
| | | * | | | Define $sql_extra2 variable before extendingMax Kostikov2021-03-081-0/+1
| | | | | | |
| | * | | | | fix summary not saved in browser autosave draftMario2021-03-081-0/+7
| | |/ / / /
| | * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-03-083-3/+2
| | |\ \ \ \
| | | * | | | Merge branch 'dev' into 'dev'Mario2021-03-081-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined page end on non dynamic pages See merge request hubzilla/core!1920
| | | | * | | Fix Spanish plural expressionMax Kostikov2021-03-081-1/+1
| | | | | | |
| | | | * | | Fix undefined page end on non dynamic pagesMax Kostikov2021-03-081-1/+1
| | | | | | |
| | | * | | | Fix Spanish plural expressionMax Kostikov2021-03-081-1/+1
| | | |/ / /
| | | * | | 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
| | * | | | | | | type submit should not be type buttonMario2021-03-081-1/+1
| | | | | | | | |
| | * | | | | | | fix unexpected trigger of buttons when pressing enter in input field issue #1528Mario2021-03-082-28/+28
| | |/ / / / / /
| | * | | | | | Update Spanishmjfriaza2021-03-082-15205/+15097
| | | | | | | |
| | * | | | | | fix dev versionMario2021-03-082-2/+2
| | | | | | | |
| * | | | | | | a bit more useability for the admin at the beginningHilmar R2021-03-031-1/+2
| | | | | | | |
| * | | | | | | embarrassing :-(Hilmar R2021-03-021-1/+1
| | | | | | | |
| * | | | | | | did2 chk num 5...10Hilmar R2021-03-021-2/+2
| | | | | | | |
| * | | | | | | hope not to hurry too fast when saying 5.4RC2. But today & tomorrow is only ↵Hilmar R2021-03-022-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the tests
| * | | | | | | melt include/accountHilmar R2021-03-022-78/+553
| | | | | | | |
| * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devHilmar R2021-03-010-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | get devHilmar R2021-03-011194-68684/+122630
| | | | | | | |
| * | | | | | | adjust air.5 to be in sync with 5.2.2Hilmar R2021-02-263-53/+77
| | | | | | | |
| * | | | | | | repair dd tag and set unique vsnHilmar R2021-02-262-2/+2
| | | | | | | |
| * | | | | | | forgotten docsHilmar R2021-01-303-0/+81
| | | | | | | |
| * | | | | | | validate,inviteHilmar R2021-01-301-11/+21
| | | | | | | |
| * | | | | | | context help register en,deHilmar R2021-01-291-1/+12
| | | | | | | |
| * | | | | | | Register panel interaction consistence usageHilmar R2021-01-284-54/+84
| | | | | | | |
| * | | | | | | login panel, reg limits.Hilmar R2021-01-274-38/+56
| | | | | | | |
| * | | | | | | Two field positionsHilmar R2021-01-241-2/+2
| | | | | | | |
| * | | | | | | auto channel create adjustmentsHilmar R2021-01-241-9/+8
| | | | | | | |
| * | | | | | | auto channel create adjustments, zar log reg msgsHilmar R2021-01-242-4/+12
| | | | | | | |
| * | | | | | | 2 fields dups removedHilmar R2021-01-231-4/+2
| | | | | | | |
| * | | | | | | typoHilmar R2021-01-231-1/+1
| | | | | | | |
| * | | | | | | melt diff prod fork 4.6.2 air onto 5.2.1 to 5.2.2 DB 1241Hilmar R2021-01-2325-432/+2810
| | | | | | | |
| * | | | | | | at end of day, some files probably without conflicts so farHilmar R2021-01-2321-4/+243
| | | | | | | |
| * | | | | | | Merge branch 'master' into air.5Hilmar R2021-01-22514-15785/+36223
| |\ \ \ \ \ \ \
| * | | | | | | | air.s1: field templates checkbox/input/select and one newme2020-11-144-4/+139
| | | | | | | | |
* | | | | | | | | version 5.4.35.4.3Mario Vavti2021-04-201-1/+1
| | | | | | | | |
* | | | | | | | | changelogMario2021-04-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5dfe4ef6f8efc34de03953a91980b52646233a29)
* | | | | | | | | fix regression in mod notificationsMario2021-04-201-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b8a5f5fbf2b1702642c9489ea5ae3360c5b731bb)
* | | | | | | | | floc off googleMario2021-04-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7ccd7b439f5a029384ecb28911a0df6f6d658231)
* | | | | | | | | use protect_sprintf() on query stringsMario2021-04-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f9793e870f5c3c531fe48a2294782de0643a6c9b)
* | | | | | | | | Wfinger - check https from http_x_forwarded_protoMiłosz Kłosowicz2021-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit aa2450fae1fe41a6b100d152209f66fb66bc270e)
* | | | | | | | | fix regression finding bookmarksMario2021-04-201-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 16cc695115688b04dae1b3ab97aef149b17bc7e4)
* | | | | | | | | potential export issue when using PHP8Mario2021-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ba412bc6cf0110b089493ee8f9b65cda0487001f)
* | | | | | | | | if we use dbescbin on save we should use dbunescbin when retrieving (at ↵Mario2021-04-201-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 - ↵Mario2021-04-201-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 changeMario2021-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit eded0f6c09475a138e042de4f6845d54e7a6e60c)