aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | translate make-friend activities to zot6zotlabs2019-05-201-0/+8
| |/ / |/| |
* | | calendar merge: only export events that will not break the importer. this wil...Mario Vavti2019-05-151-2/+3
* | | missing backslashMario Vavti2019-05-151-1/+1
* | | Merge branch 'dev' into 'dev'Mario2019-05-141-6/+9
|\ \ \
| * | | bbcode map bypass wasn't catching all map forms.zotlabs2019-05-131-6/+9
* | | | add autocomplete js to calendar and fix issue with extended likes midMario Vavti2019-05-142-3/+7
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-131-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix comments scroll button CSSMax Kostikov2019-05-131-3/+3
|/ / /
* | | css fixesMario Vavti2019-05-133-4/+4
* | | deal with privacy mentions in event descriptionsMario Vavti2019-05-131-11/+35
* | | fix button sizeMario Vavti2019-05-131-1/+1
* | | bump versionMario Vavti2019-05-131-1/+1
* | | bump version, update autoload cache and update stringsMario Vavti2019-05-132-1258/+1402
* | | calendar merge: cleanupMario Vavti2019-05-131-138/+9
* | | upgrade jgrowlMario Vavti2019-05-1320-6/+1222
* | | port db_indexes() from zapMario Vavti2019-05-131-0/+25
* | | don't do oembed processing on naked links and smarty lib cleanup. ported from...Mario Vavti2019-05-133-42/+50
* | | optimise oembed pdf processing so we do not actually load the content, which ...Mario Vavti2019-05-131-15/+16
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-05-132-300/+286
|\| |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-05-122-300/+286
| |\ \
| | * | Update hstrings.phpMax Kostikov2019-05-121-11/+8
| | * | Update hmessages.poMax Kostikov2019-05-121-289/+278
* | | | form security token for mod register ported from zapMario Vavti2019-05-132-4/+9
|/ / /
* | | add btlogger to unxmlify()Mario Vavti2019-05-111-0/+9
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-111-1/+1
|\| |
| * | Replace photo URL for gallery on clonned channel post syncMax Kostikov2019-05-111-1/+1
* | | Merge branch 'dev' into 'dev'Mario2019-05-112-15/+17
|\ \ \
| * | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendere...zotlabs2019-05-092-15/+17
* | | | bump versionMario Vavti2019-05-101-1/+1
* | | | update justified gallery libMario Vavti2019-05-104-80/+123
* | | | css fix for bootstrap 4.3.1Mario Vavti2019-05-101-0/+4
* | | | update bootstrap to version 4.3.1Mario Vavti2019-05-10448-23029/+27299
* | | | fix issue with color selectorMario Vavti2019-05-101-3/+7
* | | | typoMario Vavti2019-05-101-1/+1
* | | | calendar merge: implement channel calendar import in cdav/calendarMario Vavti2019-05-106-21/+22
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-097-31/+33
|\ \ \
| * | | remove the caldav and event app and make calendar the default appMario Vavti2019-05-097-31/+33
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-092-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add 'Create' button translationMax Kostikov2019-05-091-0/+1
| * | Add 'Create' button translationMax Kostikov2019-05-091-1/+1
* | | calendar merge: cleanup and comment out some unused codeMario Vavti2019-05-095-81/+69
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-084-4/+44
|\ \ \
| * | | another DB update to fix uid_mid index in item table and add xchan_photo_m in...Mario Vavti2019-05-084-4/+44
|/ / /
* | | Merge branch 'channel_update' into 'dev'Max Kostikov2019-05-084-1933/+48
|\ \ \
| * | | Channel updateMario2019-05-084-1933/+48
|/ / /
* | | remove option which should never have slipped into dev branchMario Vavti2019-05-081-2/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-081-6/+5
|\| |
| * | Replace own image URL in clonned channel postsMax Kostikov2019-05-081-6/+5
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-082-14/+4
|\| |
| * | Update Photos.phpMax Kostikov2019-05-081-1/+1