aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | | support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-272-538/+19
| | | | | | | | | | | |
| | | | * | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-2653-32045/+16193
| | | |/| | | | | | | | | | |/|/ / / / / / / / | | |/| | | | | | | | | |/| | | | | | | | |
| * | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | | | | fix typoMario Vavti2019-06-181-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | update composer libsMario Vavti2019-06-179-87/+125
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | changelog and versionMario Vavti2019-06-172-1/+16
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | http signature consolidationzotlabs2019-06-2622-177/+296
| | | | | |/ / / / / / / /
| | | | | * | | | | | | | 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
| | | | |/ / / / / / / /
| | | | * | | | | | | | 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)
| | * | | | | | | | | minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-173-3/+3
| | | | | | | | | | |
* | | | | | | | | | | minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit becaa3b920bfe87c031c01bdf35d35db5c82e31e)
* | | | | | | | | | | apply calendar encoding fixes to mod calMario Vavti2019-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 24b0f8e27e2f5e035b9a8f488bae8d79a10398a4)
* | | | | | | | | | | fix encoding also for description and locationMario Vavti2019-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f37387de8061aab7221dde7697402be564d596d5)
* | | | | | | | | | | 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(). ; (cherry picked from commit 4f705fc3f8daa71d878cbb275651cc55b03e1015)
* | | | | | | | | | | tweak to event title encoding to ensure it works with German, Russian, as ↵zotlabs2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as angle chars (cherry picked from commit 952e466d9121726f00c94b6527ff01255529b82c)
* | | | | | | | | | | events: don't use htmlentities on local (hz) event titles as they are not ↵zotlabs2019-06-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being used in textareas and umlauts for instance are getting mangled on the calendar display (cherry picked from commit c1cc76119cf055c50045af24df07040fa32d2bf6)