aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more work on zap exportzotlabs2020-01-252-1/+25
* bugfix: event_addtocal not preserving original privacy expectationzotlabs2020-01-241-1/+1
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-2431-872/+634
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-01-232-389/+514
| |\
| | * Merge branch 'dev' into 'dev'Max Kostikov2020-01-222-389/+514
| | |\
| | | * Update hstrings.phpMax Kostikov2020-01-221-27/+48
| | | * Update hmessages.poMax Kostikov2020-01-221-362/+466
| * | | make sure we import the zot6 xchan if we do not have it yetMario2020-01-231-1/+12
| |/ /
| * | Merge branch 'dev' into 'dev'Mario2020-01-221-1/+1
| |\|
| | * Don't validate domain with PTR record; remove uneccessary CNAME check; add IP...Max Kostikov2020-01-191-1/+1
| * | fix typoMario2020-01-211-1/+1
| * | more shortlocalize and bdi tagsMario2020-01-201-5/+9
| * | the address or URL as linktitle should be sufficientMario2020-01-181-2/+2
| * | missing update fileMario2020-01-181-0/+25
| * | we need 24h formatMario2020-01-181-1/+1
| * | introduce db_str_to_date()Mario2020-01-182-0/+13
| * | fix shortlocalizeMario2020-01-182-2/+2
| * | move mail frontend to addons and remove mail app from system appsMario2020-01-186-459/+6
| * | implement bdi tags via bbcode where possibleMario2020-01-183-8/+14
| * | more bdi tagsMario2020-01-182-7/+7
| * | wrap profile names in bdi tags to prevent mastodon-kiddies to mess with the l...Mario2020-01-183-3/+3
| * | $owner in get_feed_for() is the atom rendered channel, for atom_entry we need...Mario2020-01-171-2/+2
| * | some work on zot6 DMsMario2020-01-1510-4/+35
| * | fix typoMario2020-01-151-1/+1
| * | Merge branch 'dev' into 'dev'Mario2020-01-158-33/+344
| |\ \
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-14865-25618/+41541
|\| | | | |/ / |/| |
| * | Merge branch 'dev' into 'dev'Mario2020-01-141-6/+6
| |\|
| | * Fix wrong URL detection with Markdown support enabledMax Kostikov2020-01-121-6/+6
| * | composer update symfony/polyfill-ctypeMario2020-01-124-23/+23
| * | composer update sabre/davMario2020-01-1247-230/+365
| * | update cropperjs to the recent versionMario2020-01-11210-18185/+23891
| * | fix markdown testMario2020-01-091-2/+2
| * | composer updatesMario2020-01-0932-410/+217
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-01-091-3/+11
| |\ \
| | * | Merge branch 'dev' into 'dev'Mario2020-01-091-3/+11
| | |\|
| | | * Update Cache.phpMax Kostikov2020-01-061-2/+1
| | | * Add age choice on cached item retrieveMax Kostikov2020-01-051-2/+11
| * | | deal with situations where we do not have an xchan_addr but only an xchan_urlMario2020-01-091-3/+3
| |/ /
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-12-281-1/+1
| |\ \
| | * | Fixed es-es/hmessages.pomjfriaza2019-12-281-1/+1
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-282-3/+3
| |\| |
| | * | Update Spanishmjfriaza2019-12-282-3/+3
| |/ /
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2019-12-282-193/+217
| |\ \
| | * | Merge branch 'dev' into 'dev'Max Kostikov2019-12-272-193/+217
| | |\|
| | | * Update hstrings.phpMax Kostikov2019-12-271-10/+13
| | | * Update hmessages.poMax Kostikov2019-12-271-183/+204
| * | | pubstream: use search mode for tag filter view and add a titleMario2019-12-281-2/+7
| |/ /
| * | re-add german translations for x minutes etc. which were removed in rkor's me...Mario2019-12-211-0/+5
| * | german translation fixesMario2019-12-212-10/+4
| * | Merge branch 'dev' into 'dev'Mario2019-12-219-662/+1504
| |\ \