aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | fix typoMario Vavti2019-07-031-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Mario2019-07-024-8/+45
|\| | | | | | | | | | | | | | begin directory migration to zot6, see the code comments See merge request hubzilla/core!1687
| * | I'm pretty sure the LD construct 'diaspora:guid' isn't actually legal ↵zotlabs2019-07-012-2/+5
| | | | | | | | | | | | without a definition of 'diaspora' in the current or parent LD context.
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-07-011-1/+1
| |\ \ | |/ / |/| |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-07-011-1/+1
|\ \ \ | | |/ | |/| | | | | | | Fix missprint in German translation See merge request hubzilla/core!1688
| * | Update hstrings.phpMax Kostikov2019-07-011-1/+1
| | |
| | * add opengraph meta info to channel pagezotlabs2019-06-291-0/+11
| | |
| | * zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted ↵zotlabs2019-06-281-5/+2
| | | | | | | | | | | | accordingly.
| | * I wonder how long zot_finger() has been missing and how this may have ↵zotlabs2019-06-281-1/+1
| | | | | | | | | | | | affected the directory servers.
| | * minor fixzotlabs2019-06-281-1/+1
| | |
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-285-11/+8
| | |\ | |_|/ |/| |
* | | 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
| | | | | | | | | (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
| | | * begin directory migration to zot6, see the code commentszotlabs2019-06-281-0/+26
| | | |
| | | * extend definition of direct message to anything with allow_cid but *not* ↵zotlabs2019-06-271-1/+6
| | | | | | | | | | | | | | | | allow_gid.
| | | * photo objects: incorrect media type on linkszotlabs2019-06-271-4/+4
| | | |
| | | * 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
| | | | |