aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'dev' into 'dev'Mario2020-01-305-4/+34
|\ \ \ \
| * | | | z6 compat workZot2020-01-305-4/+34
|/ / / /
* | | | provide img and zmg tags with image descriptionMario2020-01-301-0/+9
| | * | basic poll support and patch to not call System::get_platform_name() within t...zotlabs2020-01-308-11/+330
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-292-2/+4
| | |\ \ | |_|/ / |/| | |
| | * | z6 transition work - prevent z6 sync packets from being unpacked into an inco...zotlabs2020-01-293-3/+9
| | * | more work on zap exportzotlabs2020-01-252-1/+25
| | | * zap is storing perms different from hubzilla - revert Lib/Connect to use the ...Mario2020-01-301-4/+5
| | | * update create_identity() to use Lib/Connect via connect_and_sync() ported fro...Mario2020-01-261-5/+50
| | | * port Lib/Connect and Module/Follow from zap. Connect with new connections via...Mario2020-01-265-23/+838
| |_|/ |/| |
* | | Merge branch 'dev' into 'dev'Mario2020-01-261-1/+1
|\ \ \ | | |/ | |/|
| * | 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 devzotlabs2020-01-14865-25618/+41541
| |\ \ \
* | | | | minor private forum notifications fixesMario2020-01-252-2/+4
| |_|/ / |/| | |
* | | | 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
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | event compatibility workzotlabs2020-01-146-17/+300
| * | rework activitystreams events - send invite/event activities instead of creat...zotlabs2020-01-124-16/+44
* | | 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