aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-282-538/+19
| | | (cherry picked from commit 9def9a5cb7ab7799911013580c714605e9698122)
* photo objects: incorrect media type on linkszotlabs2019-06-281-4/+4
| | | (cherry picked from commit 60c003733e7fed70f28eadaf3d9abcf16ec3a8ab)
* extend definition of direct message to anything with allow_cid but *not* ↵zotlabs2019-06-281-1/+6
| | | | | allow_gid. (cherry picked from commit 96a99935ef4f2da899275166b127537287966dac)
* 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 consolidation See merge request hubzilla/core!1685
| * 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
|\| | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684
| * allow api login by address or url (url will use zot6 hubloc records, address ↵zotlabs2019-06-251-1/+5
| | | | | | | | can use either zot or zot6 hubloc records)
| * 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 ZAP See merge request hubzilla/core!1683
| * | 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 items export all See merge request hubzilla/core!1680
| * | | 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 sync See merge request hubzilla/core!1682
| * | 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
| | | | | | | | | This reverts commit e8918ca149f9eb0ea4148431772b9e5090f3ea7f
| * | 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 ↵Mario Vavti2019-06-211-2/+2
| | | | | | | | | | | | with mid's that contain single quotes
* | | 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 ↵Mario Vavti2019-06-201-8/+31
| | | | | | | | | | | | | | | | | | navigation, hide start and end time fields in month view (only allday events can be generated there), remove the action arg from changeView(). ;
* | | Merge branch 'dev' into 'dev'Mario2019-06-209-21/+32
|\ \ \ | | |/ | |/| | | | | | | changes to support direct messages in zot6 (set item.item_private = 2 when... See merge request hubzilla/core!1679
| * | tweak to event title encoding to ensure it works with German, Russian, as ↵zotlabs2019-06-191-1/+1
| | | | | | | | | | | | well as angle chars
| * | events: don't use htmlentities on local (hz) event titles as they are not ↵zotlabs2019-06-192-3/+4
| | | | | | | | | | | | being used in textareas and umlauts for instance are getting mangled on the calendar display
| * | changes to support direct messages in zot6 (set item.item_private = 2 when ↵zotlabs2019-06-197-18/+28
| | | | | | | | | | | | private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage)
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-0/+1
|\ \ \ | | |/ | |/| | | | | | | Remove cached photo location directory on delete if empty See merge request hubzilla/core!1678
| * | 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 URL See merge request hubzilla/core!1677
| * | Use html_entity_decode() for cached photo URLMax Kostikov2019-06-191-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\| | | | | | | | | | | | | | Include Zot6 hubs in the Grid scope See merge request hubzilla/core!1676
| * | 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 German and Russian translations See merge request hubzilla/core!1674
| * | 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 thumbnails See merge request hubzilla/core!1672
| * | Fix os_path replace for thumbnailsMax Kostikov2019-06-181-1/+1
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-06-1833-18085/+407
| |\ \ | |/ / |/| | | | | | | | Dev See merge request kostikov/core!1
* | | 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 use See merge request hubzilla/core!1671
| * | minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-173-3/+3
| | |
* | | fix typoMario Vavti2019-06-181-2/+2
| | |
* | | update composer libsMario Vavti2019-06-179-87/+125
| | |
* | | changelog and versionMario Vavti2019-06-172-1/+16
| | |
* | | disable events module. it is now disfunctionalMario Vavti2019-06-172-8/+6
| | |
* | | remove old fullcalendar libraryMario Vavti2019-06-1712-17676/+0
| | |