aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-07-011-1/+1
|\
| * Update hstrings.phpMax Kostikov2019-07-011-1/+1
* | decode encoded midMario Vavti2019-06-281-2/+1
* | missing class importMario Vavti2019-06-281-0/+1
* | regenerate autoload cacheMario Vavti2019-06-282-2/+0
* | support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-282-538/+19
* | photo objects: incorrect media type on linkszotlabs2019-06-281-4/+4
* | extend definition of direct message to anything with allow_cid but *not* allo...zotlabs2019-06-281-1/+6
* | fix typoMario Vavti2019-06-271-1/+1
* | do not check send_stream permission for commentsMario Vavti2019-06-271-7/+6
* | Merge branch 'httpsig' into 'dev'Mario2019-06-2722-177/+296
|\ \
| * | http signature consolidationzotlabs2019-06-2622-177/+296
* | | port some functions from osadaMario Vavti2019-06-261-15/+272
* | | Merge branch 'dev' into 'dev'Mario2019-06-262-1/+24
|\| |
| * | allow api login by address or url (url will use zot6 hubloc records, address ...zotlabs2019-06-251-1/+5
| * | provide auto redirect from zot6 /item permalinkszotlabs2019-06-251-0/+19
* | | Merge branch 'fix-item_export-api-path' into 'dev'Mario2019-06-261-2/+2
|\ \ \
| * | | Make export_page API endpoint match ZAPDM42.Net (Matt Dent)2019-06-231-2/+2
* | | | Merge branch 'export_items-export_all' into 'dev'Mario2019-06-261-2/+2
|\ \ \ \
| * | | | export all items except photosDM42.Net (Matt Dent)2019-06-211-2/+2
| |/ / /
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-211-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix thumbnails processing logic on files syncMax Kostikov2019-06-211-1/+1
| * | Revert "Respect photo thumbnails storage in import"Max Kostikov2019-06-211-3/+5
| * | Respect photo thumbnails storage in importMax Kostikov2019-06-211-5/+3
* | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue with...Mario Vavti2019-06-211-2/+2
* | | apply calendar encoding fixes to mod calMario Vavti2019-06-201-3/+3
* | | fix encoding also for description and locationMario Vavti2019-06-201-3/+3
* | | various calendar UI improvements: make day- and weeknumbers clickable for nav...Mario Vavti2019-06-201-8/+31
* | | Merge branch 'dev' into 'dev'Mario2019-06-209-21/+32
|\ \ \ | | |/ | |/|
| * | tweak to event title encoding to ensure it works with German, Russian, as wel...zotlabs2019-06-191-1/+1
| * | events: don't use htmlentities on local (hz) event titles as they are not bei...zotlabs2019-06-192-3/+4
| * | changes to support direct messages in zot6 (set item.item_private = 2 when pr...zotlabs2019-06-197-18/+28
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-0/+1
|\ \ \ | | |/ | |/|
| * | Remove cached photo location directory on delete if emptyMax Kostikov2019-06-191-0/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\| |
| * | Use html_entity_decode() for cached photo URLMax Kostikov2019-06-191-1/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\| |
| * | Update zid.phpMax Kostikov2019-06-191-1/+1
| * | Include Zot6 hubs in the Grid scopeMax Kostikov2019-06-181-1/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-184-13843/+15287
|\| |
| * | Update hstrings.phpMax Kostikov2019-06-181-13/+14
| * | Update hmessages.poMax Kostikov2019-06-181-551/+553
| * | Update hstrings.phpMax Kostikov2019-06-181-2566/+2805
| * | Update hmessages.poMax Kostikov2019-06-181-10713/+11915
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-181-1/+1
|\| |
| * | Fix os_path replace for thumbnailsMax Kostikov2019-06-181-1/+1
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-06-1833-18085/+407
| |\ \ | |/ / |/| |
* | | Avoid to process original images using storeThumbnailMax Kostikov2019-06-181-3/+7
* | | Merge branch 'dev' into 'dev'Mario2019-06-183-3/+3
|\ \ \ | | |/ | |/|
| * | minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-173-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 15:52:39 +0000